diff options
-rw-r--r-- | modules/database/db_old.cpp | 10 | ||||
-rw-r--r-- | modules/pseudoclients/nickserv.cpp | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index 97cd5bce5..f67ff1b2a 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -429,6 +429,11 @@ static void LoadNicks() READ(read_string(buffer, f)); NickCore *nc = new NickCore(buffer); + const Anope::string settings[] = { "killprotect", "kill_quick", "ns_secure", "ns_private", "hide_email", + "hide_mask", "hide_quit", "memo_signon", "memo_receive", "autoop", "msg", "ns_keepmodes" }; + for (unsigned j = 0; j < sizeof(settings) / sizeof(Anope::string); ++j) + nc->Shrink<bool>(settings[j].upper()); + char pwbuf[32]; READ(read_buffer(pwbuf, f)); if (hashm == "plain") @@ -692,6 +697,11 @@ static void LoadChannels() READ(read_buffer(namebuf, f)); ChannelInfo *ci = new ChannelInfo(namebuf); + const Anope::string settings[] = { "keeptopic", "peace", "cs_private", "restricted", "cs_secure", "secureops", "securefounder", + "signkick", "signkick_level", "topiclock", "persist", "noautoop", "cs_keepmodes" }; + for (unsigned j = 0; j < sizeof(settings) / sizeof(Anope::string); ++j) + ci->Shrink<bool>(settings[j].upper()); + READ(read_string(buffer, f)); ci->SetFounder(NickCore::Find(buffer)); diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 4c512b427..1f167bb61 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -274,6 +274,8 @@ class NickServCore : public Module, public NickServService defaults.push_back("MEMO_SIGNON"); defaults.push_back("MEMO_RECEIVE"); } + else if (defaults[0].equals_ci("none")) + defaults.clear(); } void OnDelNick(NickAlias *na) anope_override |