Header update: 2007 -> 2008

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

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index f9d3a418eb920fbc695db1f97dc1171095d18083..1859cf5cb5165855f0b20f040d6a43cead69021b 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,35 +14,33 @@
 /* $ModDesc: Allows global loading of a module. */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /** Handle /GLOADMODULE
  */
-class cmd_gloadmodule : public command_t
+class CommandGloadmodule : public Command
 {
  public:
-       cmd_gloadmodule (InspIRCd* Instance) : command_t(Instance,"GLOADMODULE", 'o', 1)
+       CommandGloadmodule (InspIRCd* Instance) : Command(Instance,"GLOADMODULE", 'o', 1)
        {
                this->source = "m_globalload.so";
                syntax = "<modulename> [servermask]";
+               TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
                std::string servername = pcnt > 1 ? parameters[1] : "*";
 
                if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
                {
-                       if (ServerInstance->LoadModule(parameters[0]))
+                       if (ServerInstance->Modules->Load(parameters[0]))
                        {
                                ServerInstance->WriteOpers("*** NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0],user->nick);
                                user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]);
                        }
                        else
                        {
-                               user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                               user->WriteServ("974 %s %s :%s",user->nick, parameters[0],ServerInstance->Modules->LastError().c_str());
                        }
                }
                else
@@ -54,29 +52,29 @@ class cmd_gloadmodule : public command_t
 
 /** Handle /GUNLOADMODULE
  */
-class cmd_gunloadmodule : public command_t
+class CommandGunloadmodule : public Command
 {
  public:
-       cmd_gunloadmodule (InspIRCd* Instance) : command_t(Instance,"GUNLOADMODULE", 'o', 1)
+       CommandGunloadmodule (InspIRCd* Instance) : Command(Instance,"GUNLOADMODULE", 'o', 1)
        {
                this->source = "m_globalload.so";
                syntax = "<modulename> [servermask]";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
                std::string servername = pcnt > 1 ? parameters[1] : "*";
 
                if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
                {
-                       if (ServerInstance->UnloadModule(parameters[0]))
+                       if (ServerInstance->Modules->Unload(parameters[0]))
                        {
                                ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick);
                                user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]);
                        }
                        else
                        {
-                               user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                               user->WriteServ("972 %s %s :%s",user->nick, parameters[0],ServerInstance->Modules->LastError().c_str());
                        }
                }
                else
@@ -88,28 +86,28 @@ class cmd_gunloadmodule : public command_t
 
 /** Handle /GRELOADMODULE
  */
-class cmd_greloadmodule : public command_t
+class CommandGreloadmodule : public Command
 {
  public:
-       cmd_greloadmodule (InspIRCd* Instance) : command_t(Instance, "GRELOADMODULE", 'o', 1)
+       CommandGreloadmodule (InspIRCd* Instance) : Command(Instance, "GRELOADMODULE", 'o', 1)
        {
                this->source = "m_globalload.so";
                syntax = "<modulename> [servermask]";
        }
 
-       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle(const char** parameters, int pcnt, User *user)
        {
                std::string servername = pcnt > 1 ? parameters[1] : "*";
 
                if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
                {
-                       if (!ServerInstance->UnloadModule(parameters[0]))
+                       if (!ServerInstance->Modules->Unload(parameters[0]))
                        {
-                               user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                               user->WriteServ("972 %s %s :%s",user->nick, parameters[0],ServerInstance->Modules->LastError().c_str());
                        }
-                       if (!ServerInstance->LoadModule(parameters[0]))
+                       if (!ServerInstance->Modules->Load(parameters[0]))
                        {
-                               user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                               user->WriteServ("974 %s %s :%s",user->nick, parameters[0],ServerInstance->Modules->LastError().c_str());
                        }
                        ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0],user->nick);
                        user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]);
@@ -123,20 +121,21 @@ class cmd_greloadmodule : public command_t
 
 class ModuleGlobalLoad : public Module
 {
-       cmd_gloadmodule *mycommand;
-       cmd_gunloadmodule *mycommand2;
-       cmd_greloadmodule *mycommand3;
+       CommandGloadmodule *mycommand;
+       CommandGunloadmodule *mycommand2;
+       CommandGreloadmodule *mycommand3;
        
  public:
        ModuleGlobalLoad(InspIRCd* Me) : Module(Me)
        {
                
-               mycommand = new cmd_gloadmodule(ServerInstance);
-               mycommand2 = new cmd_gunloadmodule(ServerInstance);
-               mycommand3 = new cmd_greloadmodule(ServerInstance);
+               mycommand = new CommandGloadmodule(ServerInstance);
+               mycommand2 = new CommandGunloadmodule(ServerInstance);
+               mycommand3 = new CommandGreloadmodule(ServerInstance);
                ServerInstance->AddCommand(mycommand);
                ServerInstance->AddCommand(mycommand2);
                ServerInstance->AddCommand(mycommand3);
+
        }
        
        virtual ~ModuleGlobalLoad()
@@ -150,3 +149,4 @@ class ModuleGlobalLoad : public Module
 };
 
 MODULE_INIT(ModuleGlobalLoad)
+