diff options
| -rw-r--r-- | data/nickserv.example.conf | 10 | ||||
| -rw-r--r-- | src/config.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index d3e1ffb14..944aa863a 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -110,16 +110,16 @@ nickserv * - hideemail: Hide's the nick's e-mail address from NickServ's INFO command * - hideusermask: Hide's the nick's last or current user@host from NickServ's INFO command * - hidequit: Hide's the nick's last quit message - * - memosignon: Notify user if they have a new memo when they sign into the nick - * - memoreceive: Notify user if they have a new memo as soon as it's received + * - memo_signon: Notify user if they have a new memo when they sign into the nick + * - memo_receive: Notify user if they have a new memo as soon as it's received * - autoop: User will be automatically opped in channels they enter and have access to * - msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires UsePrivmsg * to be enabled as well * - * This directive is optional, if left blank, the options will default to secure, memosignon, and - * memoreceive. If you really want no defaults, use "none" by itself as the option. + * This directive is optional, if left blank, the options will default to secure, memo_signon, and + * memo_receive. If you really want no defaults, use "none" by itself as the option. */ - defaults="secure private hideemail hideusermask memosignon memoreceive autoop" + defaults="secure private hideemail hideusermask memo_signon memo_receive autoop" /* * A list of languages to load on startup that will be available in /nickserv set language. diff --git a/src/config.cpp b/src/config.cpp index cd78f0f83..2f12fbc6a 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -44,8 +44,8 @@ ServerConfig::ServerConfig() if (NSDefaults.empty()) { this->NSDefFlags.insert("SECURE"); - this->NSDefFlags.insert("MEMOSIGNON"); - this->NSDefFlags.insert("MEMORECEIVE"); + this->NSDefFlags.insert("MEMO_SIGNON"); + this->NSDefFlags.insert("MEMO_RECEIVE"); } else if (!NSDefaults.equals_ci("none")) { @@ -1165,7 +1165,7 @@ ConfigItems::ConfigItems(ServerConfig *conf) {"nickserv", "unregistered_notice", "", new ValueContainerString(&conf->NSUnregisteredNotice), DT_STRING, NoValidation}, {"nickserv", "forceemail", "no", new ValueContainerBool(&conf->NSForceEmail), DT_BOOLEAN, ValidateEmailReg}, {"nickserv", "confirmemailchanges", "no", new ValueContainerBool(&conf->NSConfirmEmailChanges), DT_BOOLEAN, NoValidation}, - {"nickserv", "defaults", "secure memosignon memoreceive", new ValueContainerString(&NSDefaults), DT_STRING, NoValidation}, + {"nickserv", "defaults", "secure memo_signon memo_receive", new ValueContainerString(&NSDefaults), DT_STRING, NoValidation}, {"nickserv", "languages", "", new ValueContainerString(&conf->Languages), DT_STRING, NoValidation}, {"nickserv", "defaultlanguage", "0", new ValueContainerString(&conf->NSDefLanguage), DT_STRING, NoValidation}, {"nickserv", "regdelay", "0", new ValueContainerTime(&conf->NSRegDelay), DT_TIME, NoValidation}, |