Revert "Adds a separate config option for enabling comms/API"

This reverts commit 19d46a7084.
This commit is contained in:
VistaPOWA
2014-04-13 19:19:10 +02:00
parent 2459f5c17f
commit 08e44ad812
2 changed files with 5 additions and 7 deletions

View File

@@ -268,11 +268,10 @@
Tickcomp = 1 Tickcomp = 1
if("automute_on") if("automute_on")
automute_on = 1 automute_on = 1
if("comms_enabled") //Whether comms are enabled at all if("comms_key")
if("comms_key") //The actual password comms_key = value
comms_key = value if(value != "default_pwd" && length(value) > 6) //It's the default value or less than 6 characters long, warn badmins
if(value != "default_pwd" && length(value) > 6) //It's the default value or less than 6 characters long, warn badmins comms_allowed = 1
comms_allowed = 1
else else
diary << "Unknown setting in configuration: '[name]'" diary << "Unknown setting in configuration: '[name]'"

View File

@@ -145,6 +145,5 @@ TICKCOMP 0
## Comment this out to disable automuting ## Comment this out to disable automuting
#AUTOMUTE_ON #AUTOMUTE_ON
## Communication key for receiving data through world/Topic(), you don't want to give this out. Comms_enabled will be on if it's uncommented AND it's not the default value. ## Communication key for receiving data through world/Topic(), you don't want to give this out
COMMS_ENABLED
COMMS_KEY default_pwd COMMS_KEY default_pwd