Resolve /STATS S conflict between SVSHOLD and SHUN

[user/henk/code/inspircd.git] / src / commands / cmd_reloadmodule.cpp

diff --git a/src/commands/cmd_reloadmodule.cpp b/src/commands/cmd_reloadmodule.cpp
index 37693b501cdd6b0ec437fce5989d6a5ad4c84ef8..8492bb01d56c442275b4381bb9c1637afe083f25 100644 (file)
--- a/src/commands/cmd_reloadmodule.cpp
+++ b/src/commands/cmd_reloadmodule.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
@@ -28,6 +28,25 @@ class CommandReloadmodule : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
+class ReloadModuleWorker : public HandlerBase1<void, bool>
+{
+ public:
+       const std::string name;
+       const std::string uid;
+       ReloadModuleWorker(const std::string& uuid, const std::string& modn)
+               : name(modn), uid(uuid) {}
+       void Call(bool result)
+       {
+               ServerInstance->SNO->WriteGlobalSno('a', "RELOAD MODULE: %s %ssuccessfully reloaded",
+                       name.c_str(), result ? "" : "un");
+               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);
+       }
+};
+
 CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameters, User *user)
 {
        if (parameters[0] == "cmd_reloadmodule.so")
@@ -37,20 +56,17 @@ CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameter
                return CMD_FAILURE;
        }
 
-       if (ServerInstance->Modules->Unload(parameters[0].c_str()))
+       Module* m = ServerInstance->Modules->Find(parameters[0]);
+       if (m)
        {
-               ServerInstance->SNO->WriteGlobalSno('a', "RELOAD MODULE: %s unloaded %s",user->nick.c_str(), parameters[0].c_str());
-               if (ServerInstance->Modules->Load(parameters[0].c_str()))
-               {
-                       ServerInstance->SNO->WriteGlobalSno('a', "RELOAD MODULE: %s reloaded %s",user->nick.c_str(), parameters[0].c_str());
-                       user->WriteNumeric(975, "%s %s :Module successfully reloaded.",user->nick.c_str(), parameters[0].c_str());
-                       return CMD_SUCCESS;
-               }
+               ServerInstance->Modules->Reload(m, new ReloadModuleWorker(user->uuid, parameters[0]));
+               return CMD_SUCCESS;
+       }
+       else
+       {
+               user->WriteNumeric(975, "%s %s :Could not find module by that name", user->nick.c_str(), parameters[0].c_str());
+               return CMD_FAILURE;
        }
-
-       ServerInstance->SNO->WriteGlobalSno('a', "RELOAD MODULE: %s unsuccessfully reloaded %s",user->nick.c_str(), parameters[0].c_str());
-       user->WriteNumeric(975, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
-       return CMD_FAILURE;
 }
 
 COMMAND_INIT(CommandReloadmodule)