Rewrite the m_cgiirc configuration handling.

[user/henk/code/inspircd.git] / src / configreader.cpp

diff --git a/src/configreader.cpp b/src/configreader.cpp
index cc478b9b6be1986e126b20363c8ce541fe369c30..d198a1d84c83cfb78e0a4807382d1df2c23a8204 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -483,23 +483,23 @@ void ServerConfig::Fill()
        ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K"));
        ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E"));
 
-       memset(DisabledUModes, 0, sizeof(DisabledUModes));
+       DisabledUModes.reset();
        std::string modes = ConfValue("disabled")->getString("usermodes");
        for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
        {
-               // Complain when the character is not a-z or A-Z
-               if ((*p < 'A') || (*p > 'z') || ((*p < 'a') && (*p > 'Z')))
+               // Complain when the character is not a valid mode character.
+               if (!ModeParser::IsModeChar(*p))
                        throw CoreException("Invalid usermode " + std::string(1, *p) + " was found.");
-               DisabledUModes[*p - 'A'] = 1;
+               DisabledUModes.set(*p - 'A');
        }
 
-       memset(DisabledCModes, 0, sizeof(DisabledCModes));
+       DisabledCModes.reset();
        modes = ConfValue("disabled")->getString("chanmodes");
        for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
        {
-               if ((*p < 'A') || (*p > 'z') || ((*p < 'a') && (*p > 'Z')))
+               if (!ModeParser::IsModeChar(*p))
                        throw CoreException("Invalid chanmode " + std::string(1, *p) + " was found.");
-               DisabledCModes[*p - 'A'] = 1;
+               DisabledCModes.set(*p - 'A');
        }
 
        std::string v = security->getString("announceinvites");
@@ -548,6 +548,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
                /*
                 * These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername.
                 */
+               this->CaseMapping = old->CaseMapping;
                this->ServerName = old->ServerName;
                this->sid = old->sid;
                this->cmdline = old->cmdline;