Use the remote channel's capitalization on a losing TS merge

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

diff --git a/src/commands/cmd_loadmodule.cpp b/src/commands/cmd_loadmodule.cpp
index c6dbd8069268ed391e62b089a4fab9e361d28b42..1cdffdc5772f3161c3988d464af052b2be89ab33 100644 (file)
--- a/src/commands/cmd_loadmodule.cpp
+++ b/src/commands/cmd_loadmodule.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
@@ -12,12 +12,27 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_loadmodule.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /LOADMODULE. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandLoadmodule : public Command
 {
-       return new CommandLoadmodule(Instance);
-}
+ public:
+       /** Constructor for loadmodule.
+        */
+       CommandLoadmodule ( Module* parent) : Command(parent,"LOADMODULE",1,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);
+};
+
 
 /** Handle /LOADMODULE
  */
@@ -25,7 +40,7 @@ CmdResult CommandLoadmodule::Handle (const std::vector<std::string>& parameters,
 {
        if (ServerInstance->Modules->Load(parameters[0].c_str()))
        {
-               ServerInstance->SNO->WriteToSnoMask('a', "NEW MODULE: %s loaded %s",user->nick.c_str(), parameters[0].c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "NEW MODULE: %s loaded %s",user->nick.c_str(), parameters[0].c_str());
                user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str());
                return CMD_SUCCESS;
        }
@@ -35,3 +50,5 @@ CmdResult CommandLoadmodule::Handle (const std::vector<std::string>& parameters,
                return CMD_FAILURE;
        }
 }
+
+COMMAND_INIT(CommandLoadmodule)