Gah, im forgetting to SetMode!

[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 85b1b206e668fc9e2a427224cb1383fe08489a98..ec729f7204700ce96b01e190b259d9dd2a7524ef 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -1,3 +1,21 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *               <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
+
 // Globops and +g support module by C.J.Edwards
 
 #include <stdio.h>
@@ -8,46 +26,65 @@
 
 /* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
 
-Server *Srv;
-        
-void handle_globops(char **parameters, int pcnt, userrec *user)
+static Server *Srv;
+
+class cmd_globops : public command_t
 {
-       std::string line = "";
-       for (int i = 0; i < pcnt; i++)
+ public:
+       cmd_globops () : command_t("GLOBOPS",'o',1)
        {
-               line = line + 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))
                {
                        Srv->Log(DEFAULT,"*** m_globops: ERROR, failed to allocate user mode +g!");
                        printf("Could not claim usermode +g for this module!");
-                       exit(0);
+                       return;
+               }
+               else
+               {
+                       mycommand = new cmd_globops();
+                       Srv->AddCommand(mycommand);
                }
-               Srv->AddCommand("GLOBOPS",handle_globops,'o',1);
        }
        
        virtual ~ModuleGlobops()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1);
+               return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+       }
+
+       void Implements(char* List)
+       {
+               List[I_OnExtendedMode] = 1;
        }
        
-       virtual bool OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
        {
                // check if this is our mode character...
                if ((modechar == 'g') && (type == MT_CLIENT))
@@ -62,15 +99,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.
@@ -86,9 +114,9 @@ class ModuleGlobopsFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleGlobops;
+               return new ModuleGlobops(Me);
        }
        
 };