Remove InspIRCd* parameters and fields

[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 a6d0812feaa1c0c70680a060aebd3c43ea832297..3574ad605e6728491ebab63105dc892dc641b5b6 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -1,101 +1,74 @@
-// Globops and +g support module by C.J.Edwards
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+// Globops and +g support module by C.J.Edwards
 
-Server *Srv;
-        
-void handle_globops(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);
-}
+#include "inspircd.h"
 
+/* $ModDesc: Provides support for GLOBOPS and user mode +g */
 
-class ModuleGlobops : public Module
+/** Handle /GLOBOPS
+ */
+class CommandGlobops : public Command
 {
  public:
-       ModuleGlobops()
-       {
-               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);
-       }
-       
-       virtual ~ModuleGlobops()
-       {
-               delete Srv;
-       }
-       
-       virtual Version GetVersion()
+       CommandGlobops(Module* Creator) : Command(Creator,"GLOBOPS", 1,1)
        {
-               return Version(1,0,0,1);
+               flags_needed = 'o'; syntax = "<any-text>";
+               TRANSLATE2(TR_TEXT, TR_END);
        }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               // 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
+               std::string line = "From " + std::string(user->nick) + ": ";
+               for (int i = 0; i < (int)parameters.size(); i++)
                {
-                       // this mode isn't ours, we have to bail and return 0 to not handle it.
-                       return 0;
+                       line = line + parameters[i] + " ";
                }
+               ServerInstance->SNO->WriteToSnoMask('g',line);
+
+               /* route it (ofc :p) */
+               return CMD_SUCCESS;
        }
 
-       virtual void OnOper(userrec* user)
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               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"
+               return ROUTE_BROADCAST;
        }
-
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleGlobopsFactory : public ModuleFactory
+class ModuleGlobops : public Module
 {
+       CommandGlobops cmd;
  public:
-       ModuleGlobopsFactory()
+       ModuleGlobops()
+               : cmd(this)
        {
+               ServerInstance->AddCommand(&cmd);
+               ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
+
        }
-       
-       ~ModuleGlobopsFactory()
+
+       virtual ~ModuleGlobops()
        {
+               ServerInstance->SNO->DisableSnomask('g');
        }
-       
-       virtual Module * CreateModule()
+
+       virtual Version GetVersion()
        {
-               return new ModuleGlobops;
+               return Version("Provides support for GLOBOPS and user mode +g", VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
-};
-
 
-extern "C" void * init_module( void )
-{
-       return new ModuleGlobopsFactory;
-}
+};
 
+MODULE_INIT(ModuleGlobops)