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 eaa472e1515c0a9f4968c3d75d181bd22d69fd1d..3132aed4016685a9cc97948ecb1f3f5139acbbc9 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -22,68 +22,38 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Sets (and unsets) modes on users when they connect */
-
 class ModuleModesOnConnect : public Module
 {
  public:
-       ModuleModesOnConnect()  {
-               ServerInstance->Modules->Attach(I_OnUserConnect, this);
-       }
-
-       void Prioritize()
+       void Prioritize() CXX11_OVERRIDE
        {
                // for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
                ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
        }
 
-       virtual ~ModuleModesOnConnect()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
        }
 
-       virtual void OnUserConnect(LocalUser* user)
+       void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
        {
-               // Backup and zero out the disabled usermodes, so that we can override them here.
-               char save[64];
-               memcpy(save, ServerInstance->Config->DisabledUModes,
-                               sizeof(ServerInstance->Config->DisabledUModes));
-               memset(ServerInstance->Config->DisabledUModes, 0, 64);
-
                ConfigTag* tag = user->MyClass->config;
                std::string ThisModes = tag->getString("modes");
                if (!ThisModes.empty())
                {
                        std::string buf;
-                       std::stringstream ss(ThisModes);
-
-                       std::vector<std::string> tokens;
-
-                       // split ThisUserModes into modes and mode params
-                       while (ss >> buf)
-                               tokens.push_back(buf);
+                       irc::spacesepstream ss(ThisModes);
 
-                       std::vector<std::string> modes;
+                       CommandBase::Params modes;
                        modes.push_back(user->nick);
-                       modes.push_back(tokens[0]);
 
-                       if (tokens.size() > 1)
-                       {
-                               // process mode params
-                               for (unsigned int k = 1; k < tokens.size(); k++)
-                               {
-                                       modes.push_back(tokens[k]);
-                               }
-                       }
+                       // split ThisUserModes into modes and mode params
+                       while (ss.GetToken(buf))
+                               modes.push_back(buf);
 
-                       ServerInstance->Parser->CallHandler("MODE", modes, user);
+                       ServerInstance->Parser.CallHandler("MODE", modes, user);
                }
-
-               memcpy(ServerInstance->Config->DisabledUModes, save, 64);
        }
 };