Fixed an issue that could cause empty parameters in module commands to not be sent...

[user/henk/code/inspircd.git] / src / cmd_unloadmodule.cpp

diff --git a/src/cmd_unloadmodule.cpp b/src/cmd_unloadmodule.cpp
index 70cf2c6986a0e2022ec7cbe7aa11224cf305645d..932142049799170e442015e59f6dcdd3fc7f5076 100644 (file)
--- a/src/cmd_unloadmodule.cpp
+++ b/src/cmd_unloadmodule.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -15,22 +12,27 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_unloadmodule.h"
 
-extern InspIRCd* ServerInstance;
 
-void cmd_unloadmodule::Handle (const char** parameters, int pcnt, userrec *user)
+
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
-       if (ServerInstance->UnloadModule(parameters[0]))
+       return new cmd_unloadmodule(Instance);
+}
+
+CmdResult cmd_unloadmodule::Handle (const char** parameters, int pcnt, userrec *user)
+{
+       if (ServerInstance->Modules->Unload(parameters[0]))
        {
-               ServerInstance->WriteOpers("*** MODULE UNLOADED: %s",parameters[0]);
+               ServerInstance->WriteOpers("*** MODULE UNLOADED: %s unloaded %s", user->nick, parameters[0]);
                user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]);
        }
        else
        {
-               user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+               user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->Modules->LastError());
+               return CMD_FAILURE;
        }
+
+       return CMD_SUCCESS;
 }