Resolve /STATS S conflict between SVSHOLD and SHUN

[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 50032919a0dac9bbea03d4b244d2f89e4c9b36f0..c9a4231ddbb14298b8d45ec00c72ab7f48309b3a 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -76,7 +76,7 @@ class CommandGunloadmodule : public Command
                        if (m && ServerInstance->Modules->Unload(m))
                        {
                                ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-                               ServerInstance->DumpText(user, ":%s 973 %s %s :Module successfully unloaded.",
+                               user->SendText(":%s 973 %s %s :Module successfully unloaded.",
                                        ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
                        }
                        else
@@ -96,6 +96,25 @@ class CommandGunloadmodule : public Command
        }
 };
 
+class GReloadModuleWorker : public HandlerBase1<void, bool>
+{
+ public:
+       const std::string nick;
+       const std::string name;
+       const std::string uid;
+       GReloadModuleWorker(const std::string& usernick, const std::string& uuid, const std::string& modn)
+               : nick(usernick), name(modn), uid(uuid) {}
+       void Call(bool result)
+       {
+               ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY RELOADED BY '%s'%s", name.c_str(), nick.c_str(), result ? "" : " (failed here)");
+               User* user = ServerInstance->FindNick(uid);
+               if (user)
+                       user->WriteNumeric(975, "%s %s :Module %ssuccessfully reloaded.",
+                               user->nick.c_str(), name.c_str(), result ? "" : "un");
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
+};
+
 /** Handle /GRELOADMODULE
  */
 class CommandGreloadmodule : public Command
@@ -113,7 +132,13 @@ class CommandGreloadmodule : public Command
                if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
                {
                        Module* m = ServerInstance->Modules->Find(parameters[0]);
-                       ServerInstance->Modules->Reload(m, NULL);
+                       if (m)
+                               ServerInstance->Modules->Reload(m, new GReloadModuleWorker(user->nick, user->uuid, parameters[0]));
+                       else
+                       {
+                               user->WriteNumeric(975, "%s %s :Could not find module by that name", user->nick.c_str(), parameters[0].c_str());
+                               return CMD_FAILURE;
+                       }
                }
                else
                        ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), user->nick.c_str());