Add Module* creator to Command and ModeHandler

[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 9e55fdf71d6b42a7d70de01f256b63fa108c9b93..4c8b0e713e54945cf6ccf66fc4bde4c88bb76a51 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -2,102 +2,68 @@
  *       | 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.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 // Globops and +g support module by C.J.Edwards
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for GLOBOPS and user mode +g */
 
-
-
-class cmd_globops : public command_t
+/** Handle /GLOBOPS
+ */
+class CommandGlobops : public Command
 {
  public:
-       cmd_globops (InspIRCd* Instance) : command_t(Instance,"GLOBOPS",'o',1)
+       CommandGlobops (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"GLOBOPS","o",1,1)
        {
-               this->source = "m_globops.so";
                syntax = "<any-text>";
+               TRANSLATE2(TR_TEXT, TR_END);
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                std::string line = "From " + std::string(user->nick) + ": ";
-               for (int i = 0; i < pcnt; i++)
+               for (int i = 0; i < (int)parameters.size(); i++)
                {
-                       line = line + std::string(parameters[i]) + " ";
+                       line = line + parameters[i] + " ";
                }
                ServerInstance->SNO->WriteToSnoMask('g',line);
+
+               /* route it (ofc :p) */
+               return CMD_SUCCESS;
        }
 };
 
 class ModuleGlobops : public Module
 {
-       cmd_globops* mycommand;
+       CommandGlobops cmd;
  public:
        ModuleGlobops(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me), cmd(Me, this)
        {
-               mycommand = new cmd_globops(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
                ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
+
        }
-       
+
        virtual ~ModuleGlobops()
        {
                ServerInstance->SNO->DisableSnomask('g');
-               DELETE(mycommand);
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 0, 0, 1, VF_COMMON | VF_VENDOR);
        }
 
-       void Implements(char* List)
+       virtual Version GetVersion()
        {
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
-};
 
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-       ModuleGlobopsFactory()
-       {
-       }
-       
-       ~ModuleGlobopsFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleGlobops(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)