Change /CHECK <#channel> to correctly report timestamp since it might have been TS...

[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 1c08a48c66f9c6223dd6650c771b2c91800b02be..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-2008 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
@@ -31,20 +31,20 @@ class CommandGloadmodule : public Command
        {
                std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-               if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
                {
                        if (ServerInstance->Modules->Load(parameters[0].c_str()))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('A', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick);
-                               user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick, parameters[0].c_str());
+                               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->WriteNumeric(974, "%s %s :%s",user->nick, parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+                               user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
                        }
                }
                else
-                       ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0].c_str(), 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;
        }
@@ -65,20 +65,20 @@ class CommandGunloadmodule : public Command
        {
                std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-               if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
                {
                        if (ServerInstance->Modules->Unload(parameters[0].c_str()))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick);
-                               user->WriteNumeric(973, "%s %s :Module successfully unloaded.",user->nick, parameters[0].c_str());
+                               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->WriteNumeric(972, "%s %s :%s",user->nick, parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+                               user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
                        }
                }
                else
-                       ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), 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;
        }
@@ -99,21 +99,21 @@ class CommandGreloadmodule : public Command
        {
                std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-               if (ServerInstance->MatchText(ServerInstance->Config->ServerName, servername))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
                {
                        if (!ServerInstance->Modules->Unload(parameters[0].c_str()))
                        {
-                               user->WriteNumeric(972, "%s %s :%s",user->nick, parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+                               user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
                        }
                        if (!ServerInstance->Modules->Load(parameters[0].c_str()))
                        {
-                               user->WriteNumeric(974, "%s %s :%s",user->nick, parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+                               user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
                        }
-                       ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0].c_str(), user->nick);
-                       user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick, parameters[0].c_str());
+                       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->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), 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;
        }
@@ -124,11 +124,11 @@ class ModuleGlobalLoad : public Module
        CommandGloadmodule *mycommand;
        CommandGunloadmodule *mycommand2;
        CommandGreloadmodule *mycommand3;
-       
+
  public:
        ModuleGlobalLoad(InspIRCd* Me) : Module(Me)
        {
-               
+
                mycommand = new CommandGloadmodule(ServerInstance);
                mycommand2 = new CommandGunloadmodule(ServerInstance);
                mycommand3 = new CommandGreloadmodule(ServerInstance);
@@ -137,14 +137,14 @@ class ModuleGlobalLoad : public Module
                ServerInstance->AddCommand(mycommand3);
 
        }
-       
+
        virtual ~ModuleGlobalLoad()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };