Merge remote/local MODULES output

[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 39471a651a294001632098661fee69ccd8655cee..3e3a3a6178073954721b5988ec570ddf0bbbcaef 100644 (file)
--- a/src/commands/cmd_reloadmodule.cpp
+++ b/src/commands/cmd_reloadmodule.cpp
@@ -12,27 +12,45 @@
  */
 
 #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);
+};
 
 CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameters, User *user)
 {
+       if (parameters[0] == "cmd_reloadmodule.so")
+       {
+               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;
+       }
+
        if (ServerInstance->Modules->Unload(parameters[0].c_str()))
        {
-               ServerInstance->SNO->WriteToSnoMask('A', "RELOAD MODULE: %s unloaded %s",user->nick.c_str(), parameters[0].c_str());
+               ServerInstance->SNO->WriteToSnoMask('a', "RELOAD MODULE: %s unloaded %s",user->nick.c_str(), parameters[0].c_str());
                if (ServerInstance->Modules->Load(parameters[0].c_str()))
                {
-                       ServerInstance->SNO->WriteToSnoMask('A', "RELOAD MODULE: %s reloaded %s",user->nick.c_str(), parameters[0].c_str());
+                       ServerInstance->SNO->WriteToSnoMask('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->SNO->WriteToSnoMask('A', "RELOAD MODULE: %s unsuccessfully reloaded %s",user->nick.c_str(), parameters[0].c_str());
+       ServerInstance->SNO->WriteToSnoMask('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)