Only send ACCOUNT and CHGHOST to clients that have sent NICK/USER.

[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 1e3ea1a49b3b2181fdb6acc09cbe56e71126baea..ceb1b66fa28eb83830d77e799ba68df1fe5f778f 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -25,12 +25,6 @@
 class ModuleModesOnConnect : public Module
 {
  public:
-       void Prioritize()
-       {
-               // 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);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
@@ -38,30 +32,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.
-               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);
+                       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->Modes->Process(modes, user);
+                       ServerInstance->Parser.CallHandler("MODE", modes, user);
                }
-
-               memcpy(ServerInstance->Config->DisabledUModes, save, 64);
        }
 };