Send SVSNICKs during nick collision to prevent servers that do not fully implement...

[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 d0ace07dfab693bc6ae9cd4c276f6ee2c8b99c7d..470ac1098a4d41f610b0f7b883aaf88bf467ae55 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-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,34 +17,34 @@
 
 /** 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 std::vector<std::string> &parameters, User *user)
        {
-               std::string servername = pcnt > 1 ? parameters[1] : "*";
+               std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-               if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
                {
-                       if (ServerInstance->LoadModule(parameters[0]))
+                       if (ServerInstance->Modules->Load(parameters[0].c_str()))
                        {
-                               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]);
+                               ServerInstance->SNO->WriteToSnoMask('A', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+                               user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str());
                        }
                        else
                        {
-                               user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                               user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
                        }
                }
                else
-                       ServerInstance->WriteOpers("*** MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0],user->nick);
+                       ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0].c_str(), user->nick.c_str());
 
                return CMD_SUCCESS;
        }
@@ -52,33 +52,33 @@ 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 std::vector<std::string> &parameters, User *user)
        {
-               std::string servername = pcnt > 1 ? parameters[1] : "*";
+               std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-               if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
                {
-                       if (ServerInstance->UnloadModule(parameters[0]))
+                       if (ServerInstance->Modules->Unload(parameters[0].c_str()))
                        {
-                               ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick);
-                               user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]);
+                               ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+                               user->WriteNumeric(973, "%s %s :Module successfully unloaded.",user->nick.c_str(), parameters[0].c_str());
                        }
                        else
                        {
-                               user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                               user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
                        }
                }
                else
-                       ServerInstance->WriteOpers("*** MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0],user->nick);
+                       ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str());
 
                return CMD_SUCCESS;
        }
@@ -86,34 +86,34 @@ 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 std::vector<std::string> &parameters, User *user)
        {
-               std::string servername = pcnt > 1 ? parameters[1] : "*";
+               std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-               if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
                {
-                       if (!ServerInstance->UnloadModule(parameters[0]))
+                       if (!ServerInstance->Modules->Unload(parameters[0].c_str()))
                        {
-                               user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                               user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
                        }
-                       if (!ServerInstance->LoadModule(parameters[0]))
+                       if (!ServerInstance->Modules->Load(parameters[0].c_str()))
                        {
-                               user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                               user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), 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]);
+                       ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+                       user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str());
                }
                else
-                       ServerInstance->WriteOpers("*** MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0],user->nick);
+                       ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), user->nick.c_str());
 
                return CMD_SUCCESS;
        }
@@ -121,30 +121,32 @@ 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()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
 MODULE_INIT(ModuleGlobalLoad)
+