A ton more clear() and empty() stuff thats been lingering on the long term todo for...

[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 5a1a8f7b31f76b1e72167f305f8635074ab3c3be..95a1e1e3744a291a19ef493bf6e3cd8516a533a5 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -16,81 +13,66 @@
 
 // Globops and +g support module by C.J.Edwards
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+/* $ModDesc: Provides support for GLOBOPS and user mode +g */
 
-Server *Srv;
-        
-void handle_globops(char **parameters, int pcnt, userrec *user)
+/** Handle /GLOBOPS
+ */
+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 (InspIRCd* Instance) : command_t(Instance,"GLOBOPS",'o',1)
        {
-               line = line + std::string(parameters[i]) + " ";
+               this->source = "m_globops.so";
+               syntax = "<any-text>";
        }
-       Srv->SendToModeMask("og",WM_AND,line);
-}
 
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       {
+               std::string line = "From " + std::string(user->nick) + ": ";
+               for (int i = 0; i < pcnt; i++)
+               {
+                       line = line + std::string(parameters[i]) + " ";
+               }
+               ServerInstance->SNO->WriteToSnoMask('g',line);
+
+               /* route it (ofc :p) */
+               return CMD_SUCCESS;
+       }
+};
 
 class ModuleGlobops : public Module
 {
+       cmd_globops* mycommand;
  public:
-       ModuleGlobops()
+       ModuleGlobops(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = new Server;
-               
-               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);
-               }
-               Srv->AddCommand("GLOBOPS",handle_globops,'o',1,"m_globops.so");
+               mycommand = new cmd_globops(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
+               ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
        }
        
        virtual ~ModuleGlobops()
        {
-               delete Srv;
+               ServerInstance->SNO->DisableSnomask('g');
+               DELETE(mycommand);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1);
-       }
-       
-       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))
-               {
-                       // we dont actually do anything with the mode in this module -
-                       // just tell the core its been claimed and is ok to give users.                         
-                       return 1;
-               }
-               else
-               {
-                       // this mode isn't ours, we have to bail and return 0 to not handle it.
-                       return 0;
-               }
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
-       virtual void OnOper(userrec* user)
+       void Implements(char* List)
        {
-               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.
-
 class ModuleGlobopsFactory : public ModuleFactory
 {
  public:
@@ -102,15 +84,15 @@ class ModuleGlobopsFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleGlobops;
+               return new ModuleGlobops(Me);
        }
        
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleGlobopsFactory;
 }