m_spanningtree Replace manual string building of outgoing commands with CmdBuilder...

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

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index d029fda64e8de92b3ed2e43c53e7b3d483c02b81..7ab54cedf15c014992be7b9c07ce05fbbc6a8e2f 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -22,33 +22,19 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Sets (and unsets) modes on opers when they oper up */
-
 class ModuleModesOnOper : public Module
 {
  public:
-       ModuleModesOnOper()
-       {
-               Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-       }
-
-
-       virtual void OnRehash(User* user)
-       {
-       }
-
-       virtual ~ModuleModesOnOper()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
        }
 
-       virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
+       void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
        {
+               if (!IS_LOCAL(user))
+                       return;
+
                // whenever a user opers, go through the oper types, find their <type:modes>,
                // and if they have one apply their modes. The mode string can contain +modes
                // to add modes to the user or -modes to take modes from the user.
@@ -67,22 +53,14 @@ class ModuleModesOnOper : public Module
 
                std::string buf;
                std::stringstream ss(smodes);
-               std::vector<std::string> tokens;
+               std::vector<std::string> modes;
 
+               modes.push_back(u->nick);
                // split into modes and mode params
                while (ss >> buf)
-                       tokens.push_back(buf);
-
-               std::vector<std::string> modes;
-               modes.push_back(u->nick);
-
-               // process mode params
-               for (unsigned int k = 0; k < tokens.size(); k++)
-               {
-                       modes.push_back(tokens[k]);
-               }
+                       modes.push_back(buf);
 
-               ServerInstance->SendGlobalMode(modes, u);
+               ServerInstance->Modes->Process(modes, u);
        }
 };