From a9be866804d2020bd59673959b5629b45519e50b Mon Sep 17 00:00:00 2001 From: "Naram Qashat cyberbotx@cyberbotx.com" Date: Mon, 27 Oct 2008 03:12:39 +0000 Subject: [PATCH] Added offmessage directive to defcon block in new config. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1500 5417fbe8-f217-4b02-8779-1006273d7864 --- data/example_new.conf | 6 ++++++ src/config.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/data/example_new.conf b/data/example_new.conf index 5387e54b8..86b79d4a4 100644 --- a/data/example_new.conf +++ b/data/example_new.conf @@ -948,4 +948,10 @@ defcon * This directive is required only when globalondefconmore is set. */ #message = "Put your message to send your users here. Dont forget to uncomment globalondefconmore" + + /* + * Defines the message that will be sent when DefCon is returned to level 5. This directive is optional, + * and will also override globalondefcon and globalondefconmore when set. + */ + #offmessage = "Services are now back to normal, sorry for any inconvenience" } diff --git a/src/config.c b/src/config.c index acf0ce7d4..fa57eca4c 100644 --- a/src/config.c +++ b/src/config.c @@ -710,6 +710,7 @@ int ServerConfig::Read(bool bail) {"defcon", "globalondefcon", "no", new ValueContainerBool(&GlobalOnDefcon), DT_BOOLEAN, NoValidation}, {"defcon", "globalondefconmore", "no", new ValueContainerBool(&GlobalOnDefconMore), DT_BOOLEAN, NoValidation}, {"defcon", "message", "", new ValueContainerChar(&DefconMessage), DT_CHARPTR, ValidateDefCon}, + {"defcon", "offmessage", "", new ValueContainerChar(&DefConOffMessage), DT_CHARPTR, NoValidation}, {NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation} }; /* These tags can occur multiple times, and therefore they have special code to read them @@ -1292,8 +1293,6 @@ Directive directives[] = { {"DumpCore", {{PARAM_SET, 0, &DumpCore}}}, {"DefConAkillReason", {{PARAM_STRING, PARAM_RELOAD, &DefConAkillReason}}}, - {"DefConOffMessage", - {{PARAM_STRING, PARAM_RELOAD, &DefConOffMessage}}}, {"EncModule", {{PARAM_STRING, 0, &EncModule}}}, {"ExpireTimeout", {{PARAM_TIME, PARAM_RELOAD, &ExpireTimeout}}}, {"ForceForbidReason", {{PARAM_SET, PARAM_RELOAD, &ForceForbidReason}}},