Review and optimize

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

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index d3714a960f775da9c721fba27dccddf191b9d1d2..30129036338e64f0353bec2f487170d9c629dd98 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -27,24 +27,35 @@ using namespace std;
 /* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
 
 Server *Srv;
-        
-void handle_globops(char **parameters, int pcnt, userrec *user)
+
+class cmd_globops : public command_t
 {
-       std::string line = "*** GLOBOPS - From " + std::string(user->nick) + ": ";
-       for (int i = 0; i < pcnt; i++)
+ public:
+       cmd_globops () : command_t("GLOBOPS",'o',1)
        {
-               line = line + std::string(parameters[i]) + " ";
+               this->source = "m_globops.so";
        }
-       Srv->SendToModeMask("og",WM_AND,line);
-}
+       
+       void Handle (char **parameters, int pcnt, userrec *user)
+       {
+               std::string line = "*** GLOBOPS - From " + std::string(user->nick) + ": ";
+               for (int i = 0; i < pcnt; i++)
+               {
+                       line = line + std::string(parameters[i]) + " ";
+               }
+               Srv->SendToModeMask("og",WM_AND,line);
+       }
+};
 
 
 class ModuleGlobops : public Module
 {
+       cmd_globops* mycommand;
  public:
-       ModuleGlobops()
+       ModuleGlobops(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
                
                if (!Srv->AddExtendedMode('g',MT_CLIENT,true,0,0))
                {
@@ -52,12 +63,15 @@ class ModuleGlobops : public Module
                        printf("Could not claim usermode +g for this module!");
                        return;
                }
-               else Srv->AddCommand("GLOBOPS",handle_globops,'o',1,"m_globops.so");
+               else
+               {
+                       mycommand = new cmd_globops();
+                       Srv->AddCommand(mycommand);
+               }
        }
        
        virtual ~ModuleGlobops()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
@@ -80,15 +94,6 @@ class ModuleGlobops : public Module
                        return 0;
                }
        }
-
-       virtual void OnOper(userrec* user)
-       {
-               char* modes[2];                 // only two parameters
-               modes[0] = user->nick;          // first parameter is the nick
-               modes[1] = "+g";                // second parameter is the mode
-               Srv->SendMode(modes,2,user);    // send these, forming the command "MODE <nick> +g"
-       }
-
 };
 
 // stuff down here is the module-factory stuff. For basic modules you can ignore this.
@@ -104,9 +109,9 @@ class ModuleGlobopsFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleGlobops;
+               return new ModuleGlobops(Me);
        }
        
 };