diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-15 21:20:13 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-15 21:20:13 +0000 |
| commit | f0fe5427ff22c005220b0189ed745a38314dc21b (patch) | |
| tree | 97c625f7f3844950eaf43562e469e4d82ced2549 | |
| parent | 3ae892c608f40b461af867d89b0b3d9207aa4076 (diff) | |
Added globaloncycleup directive to options block in new config.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1728 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | data/example_new.conf | 6 | ||||
| -rw-r--r-- | src/config.c | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/data/example_new.conf b/data/example_new.conf index 31c8d1cf0..3dd5193d0 100644 --- a/data/example_new.conf +++ b/data/example_new.conf @@ -424,6 +424,12 @@ options { * globaloncycle above. */ globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone" + + /* + * This is the global message that will be sent when Services (re)join the + * network. This directive is only required if you enable globaloncycle above. + */ + globaloncycleup = "Services are now back online - have a nice day" } /* diff --git a/src/config.c b/src/config.c index 67627fb7d..1b3f627a9 100644 --- a/src/config.c +++ b/src/config.c @@ -668,6 +668,7 @@ int ServerConfig::Read(bool bail) {"options", "hidestatso", "no", new ValueContainerBool(&HideStatsO), DT_BOOLEAN, NoValidation}, {"options", "globaloncycle", "no", new ValueContainerBool(&GlobalOnCycle), DT_BOOLEAN, NoValidation}, {"options", "globaloncycledown", "", new ValueContainerChar(&GlobalOnCycleMessage), DT_CHARPTR, ValidateGlobalOnCycle}, + {"options", "globaloncycleup", "", new ValueContainerChar(&GlobalOnCycleUP), DT_CHARPTR, ValidateGlobalOnCycle}, {"nickserv", "nick", "NickServ", new ValueContainerChar(&s_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"nickserv", "description", "Nickname Registration Service", new ValueContainerChar(&desc_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"nickserv", "database", "nick.db", new ValueContainerChar(&NickDBName), DT_CHARPTR, ValidateNotEmpty}, @@ -1401,7 +1402,6 @@ Directive directives[] = { {PARAM_STRING, 0, &RemotePassword3}}}, {"RestrictOperNicks", {{PARAM_SET, PARAM_RELOAD, &RestrictOperNicks}}}, {"AnonymousGlobal", {{PARAM_SET, PARAM_RELOAD, &AnonymousGlobal}}}, - {"GlobalOnCycleUP", {{PARAM_STRING, PARAM_RELOAD, &GlobalOnCycleUP}}}, {"UseSVSHOLD", {{PARAM_SET, PARAM_RELOAD, &UseSVSHOLD}}}, {"UseTS6", {{PARAM_SET, 0, &UseTS6}}}, {"UnRestrictSAdmin", {{PARAM_SET, PARAM_RELOAD, &UnRestrictSAdmin}}}, @@ -1915,13 +1915,6 @@ int read_config(int reload) } } - if (GlobalOnCycle) { - if (!GlobalOnCycleUP) { - alog("GlobalOnCycleUP are not defined; disabling GlobalOnCycle"); - GlobalOnCycle = false; - } - } - /* Check the user keys */ if ((UserKey1 == UserKey2) || (UserKey1 == UserKey3) || (UserKey3 == UserKey2)) |