Move the <disabled> tag out of the core to a new module.

[user/henk/code/inspircd.git] / src / modules / m_conn_umodes.cpp

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index acac7640adf0149ce1ecf4117e83d387469ee671..3132aed4016685a9cc97948ecb1f3f5139acbbc9 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -38,28 +38,22 @@ class ModuleModesOnConnect : public Module
 
        void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
        {
-               // Backup and zero out the disabled usermodes, so that we can override them here.
-               const std::bitset<64> save = ServerInstance->Config->DisabledUModes;
-               ServerInstance->Config->DisabledUModes.reset();
-
                ConfigTag* tag = user->MyClass->config;
                std::string ThisModes = tag->getString("modes");
                if (!ThisModes.empty())
                {
                        std::string buf;
-                       std::stringstream ss(ThisModes);
+                       irc::spacesepstream ss(ThisModes);
 
-                       std::vector<std::string> modes;
+                       CommandBase::Params modes;
                        modes.push_back(user->nick);
 
                        // split ThisUserModes into modes and mode params
-                       while (ss >> buf)
+                       while (ss.GetToken(buf))
                                modes.push_back(buf);
 
                        ServerInstance->Parser.CallHandler("MODE", modes, user);
                }
-
-               ServerInstance->Config->DisabledUModes = save;
        }
 };