Fix potential for duplicate SID if the SID is auto generated.

[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 ae87451ba0a95cd88e87f453654ed44b6ede9156..d0ace07dfab693bc6ae9cd4c276f6ee2c8b99c7d 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
  */
@@ -26,28 +23,30 @@ class cmd_gloadmodule : public command_t
        cmd_gloadmodule (InspIRCd* Instance) : command_t(Instance,"GLOADMODULE", 'o', 1)
        {
                this->source = "m_globalload.so";
-               syntax = "<modulename>";
+               syntax = "<modulename> [servermask]";
+               TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               if (ServerInstance->LoadModule(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]);
+               std::string servername = pcnt > 1 ? parameters[1] : "*";
 
-                       /* route it! */
-                       return CMD_SUCCESS;
-               }
-               else
+               if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
                {
-                       user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
-                       /* XXX - returning CMD_FAILURE here could potentially mean half the net loads it, half doesn't. pass it on anyway? -- w00t
-                        *
-                        * Returning CMD_SUCCESS would have the same effect, just with less servers. Someone should update this module to properly
-                        * pass the success/failure for each server to the caller (or to all opers) -Special */
-                       return CMD_FAILURE;
+                       if (ServerInstance->LoadModule(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());
+                       }
                }
+               else
+                       ServerInstance->WriteOpers("*** MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0],user->nick);
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -59,21 +58,28 @@ class cmd_gunloadmodule : public command_t
        cmd_gunloadmodule (InspIRCd* Instance) : command_t(Instance,"GUNLOADMODULE", 'o', 1)
        {
                this->source = "m_globalload.so";
-               syntax = "<modulename>";
+               syntax = "<modulename> [servermask]";
        }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               if (ServerInstance->UnloadModule(parameters[0]))
+               std::string servername = pcnt > 1 ? parameters[1] : "*";
+
+               if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
                {
-                       ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick);
-                       user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]);
+                       if (ServerInstance->UnloadModule(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());
+                       }
                }
                else
-               {
-                       /* Return CMD_SUCCESS so the module will be unloaded on any servers it is loaded on - this is a seperate case entirely from loading -Special */
-                       user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
-               }
+                       ServerInstance->WriteOpers("*** MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0],user->nick);
+
                return CMD_SUCCESS;
        }
 };
@@ -86,26 +92,29 @@ class cmd_greloadmodule : public command_t
        cmd_greloadmodule (InspIRCd* Instance) : command_t(Instance, "GRELOADMODULE", 'o', 1)
        {
                this->source = "m_globalload.so";
-               syntax = "<modulename>";
+               syntax = "<modulename> [servermask]";
        }
 
        CmdResult Handle(const char** parameters, int pcnt, userrec *user)
        {
-               if (!ServerInstance->UnloadModule(parameters[0]))
-               {
-                       user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
-                       return CMD_FAILURE;
-               }
+               std::string servername = pcnt > 1 ? parameters[1] : "*";
 
-               if (!ServerInstance->LoadModule(parameters[0]))
+               if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
                {
-                       user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
-                       return CMD_FAILURE;
+                       if (!ServerInstance->UnloadModule(parameters[0]))
+                       {
+                               user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       }
+                       if (!ServerInstance->LoadModule(parameters[0]))
+                       {
+                               user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       }
+                       ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0],user->nick);
+                       user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]);
                }
+               else
+                       ServerInstance->WriteOpers("*** MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0],user->nick);
 
-               ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0],user->nick);
-               user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]);
-               
                return CMD_SUCCESS;
        }
 };
@@ -134,7 +143,7 @@ class ModuleGlobalLoad : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };