Fix a broken distro constraint in the m_ssl_gnutls PackageInfo.

[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 e19bb94146e21d152f8f61d51aa29fb764bfe7ff..acac7640adf0149ce1ecf4117e83d387469ee671 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -22,17 +22,10 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Sets (and unsets) modes on users when they connect */
-
 class ModuleModesOnConnect : public Module
 {
  public:
-       void init() CXX11_OVERRIDE
-       {
-               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);
@@ -46,10 +39,8 @@ class ModuleModesOnConnect : public Module
        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);
+               const std::bitset<64> save = ServerInstance->Config->DisabledUModes;
+               ServerInstance->Config->DisabledUModes.reset();
 
                ConfigTag* tag = user->MyClass->config;
                std::string ThisModes = tag->getString("modes");
@@ -58,29 +49,17 @@ class ModuleModesOnConnect : public Module
                        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);
-
                        std::vector<std::string> 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 >> buf)
+                               modes.push_back(buf);
 
-                       ServerInstance->Parser->CallHandler("MODE", modes, user);
+                       ServerInstance->Parser.CallHandler("MODE", modes, user);
                }
 
-               memcpy(ServerInstance->Config->DisabledUModes, save, 64);
+               ServerInstance->Config->DisabledUModes = save;
        }
 };