X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=a3e3148468bc7898b545ee0af6829a313e12393e;hb=8085aa879bd989b526791797910295944a364084;hp=2f39a66e6000d6e05caf8e50c3157a12827ffe81;hpb=e3bd782207f50d131acd008b0cbcc7545aac7690;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 2f39a66e6..a3e314846 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -31,11 +31,11 @@ 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.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
@@ -44,7 +44,7 @@ class CommandGloadmodule : public Command
 			}
 		}
 		else
-			ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0].c_str(), user->nick.c_str());
+			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,11 +65,11 @@ 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.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
@@ -78,7 +78,7 @@ class CommandGunloadmodule : public Command
 			}
 		}
 		else
-			ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str());
+			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,25 @@ 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))
 		{
+			bool ok = true;
 			if (!ServerInstance->Modules->Unload(parameters[0].c_str()))
 			{
+				ok = false;
 				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()))
 			{
+				ok = false;
 				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.c_str());
-			user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str());
+			ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+			if (ok)
+				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.c_str());
+			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 +125,26 @@ class CommandGreloadmodule : public Command
 
 class ModuleGlobalLoad : public Module
 {
-	CommandGloadmodule *mycommand;
-	CommandGunloadmodule *mycommand2;
-	CommandGreloadmodule *mycommand3;
-	
+	CommandGloadmodule cmd1;
+	CommandGunloadmodule cmd2;
+	CommandGreloadmodule cmd3;
+
  public:
-	ModuleGlobalLoad(InspIRCd* Me) : Module(Me)
+	ModuleGlobalLoad(InspIRCd* Me)
+		: Module(Me), cmd1(Me), cmd2(Me), cmd3(Me)
 	{
-		
-		mycommand = new CommandGloadmodule(ServerInstance);
-		mycommand2 = new CommandGunloadmodule(ServerInstance);
-		mycommand3 = new CommandGreloadmodule(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-		ServerInstance->AddCommand(mycommand2);
-		ServerInstance->AddCommand(mycommand3);
-
+		ServerInstance->AddCommand(&cmd1);
+		ServerInstance->AddCommand(&cmd2);
+		ServerInstance->AddCommand(&cmd3);
 	}
-	
+
 	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);
 	}
 };