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 fcdc4cb1e778060c92c19d3ab131fc9c457123d1..8492bb01d56c442275b4381bb9c1637afe083f25 100644 (file)
--- a/src/commands/cmd_reloadmodule.cpp
+++ b/src/commands/cmd_reloadmodule.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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,27 +12,61 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_reloadmodule.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+class CommandReloadmodule : public Command
 {
-       return new CommandReloadmodule(Instance);
-}
+ public:
+       /** Constructor for reloadmodule.
+        */
+       CommandReloadmodule ( Module* parent) : Command( parent, "RELOADMODULE",1) { flags_needed = 'o'; syntax = "<modulename>"; }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       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 char* const* parameters, int, User *user)
+CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       if (ServerInstance->Modules->Unload(parameters[0]))
+       if (parameters[0] == "cmd_reloadmodule.so")
        {
-               ServerInstance->SNO->WriteToSnoMask('A', "RELOAD MODULE: %s unloaded %s",user->nick, parameters[0]);
-               if (ServerInstance->Modules->Load(parameters[0]))
-               {
-                       ServerInstance->SNO->WriteToSnoMask('A', "RELOAD MODULE: %s reloaded %s",user->nick, parameters[0]);
-                       user->WriteNumeric(975, "%s %s :Module successfully reloaded.",user->nick, parameters[0]);
-                       return CMD_SUCCESS;
-               }
+               user->WriteNumeric(975, "%s %s :You cannot reload cmd_reloadmodule.so (unload and load it)",
+                       user->nick.c_str(), parameters[0].c_str());
+               return CMD_FAILURE;
+       }
+
+       Module* m = ServerInstance->Modules->Find(parameters[0]);
+       if (m)
+       {
+               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->WriteToSnoMask('A', "RELOAD MODULE: %s unsuccessfully reloaded %s",user->nick, parameters[0]);
-       user->WriteNumeric(975, "%s %s :%s",user->nick, parameters[0], ServerInstance->Modules->LastError().c_str());
-       return CMD_FAILURE;
 }
+
+COMMAND_INIT(CommandReloadmodule)