Fix for bug #415, affects only trunk (wish i'd known this before i started!)

[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..faf35d5725d271e6c23e52fc2aaf2f278f779d4a 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -14,9 +14,6 @@
 /* $ModDesc: Allows global loading of a module. */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /** Handle /GLOADMODULE
  */
@@ -27,6 +24,7 @@ class cmd_gloadmodule : public command_t
        {
                this->source = "m_globalload.so";
                syntax = "<modulename> [servermask]";
+               TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
@@ -35,14 +33,14 @@ class cmd_gloadmodule : public command_t
 
                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 :Failed to load module: %s",user->nick, parameters[0],ServerInstance->Modules->LastError());
                        }
                }
                else
@@ -69,14 +67,14 @@ class cmd_gunloadmodule : public command_t
 
                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 :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->Modules->LastError());
                        }
                }
                else
@@ -103,13 +101,13 @@ class cmd_greloadmodule : public command_t
 
                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 :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->Modules->LastError());
                        }
-                       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 :Failed to load module: %s",user->nick, parameters[0],ServerInstance->Modules->LastError());
                        }
                        ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0],user->nick);
                        user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]);