X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommands%2Fcmd_commands.cpp;h=5a047e4a772977119f786ff99fcbc24955ab13d5;hb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;hp=2b2e7ffa0b6a7d8a541e5aff89ce2066ac6b3b66;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_commands.cpp b/src/commands/cmd_commands.cpp
index 2b2e7ffa0..5a047e4a7 100644
--- a/src/commands/cmd_commands.cpp
+++ b/src/commands/cmd_commands.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,26 +12,54 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_commands.h"
 
-/** Handle /COMMANDS
+#ifndef __CMD_COMMANDS_H__
+#define __CMD_COMMANDS_H__
+
+// include the common header files
+
+#include "users.h"
+#include "channels.h"
+
+/** Handle /COMMANDS. 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.
  */
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+class CommandCommands : public Command
 {
-	return new CommandCommands(Instance);
-}
+ public:
+	/** Constructor for commands.
+	 */
+	CommandCommands ( Module* parent) : Command(parent,"COMMANDS",0,0) { }
+	/** 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 CommandCommands::Handle (const char* const*, int, User *user)
+#endif
+
+
+/** Handle /COMMANDS
+ */
+CmdResult CommandCommands::Handle (const std::vector<std::string>&, User *user)
 {
-	for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+	for (Commandtable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
 	{
-		user->WriteNumeric(702, "%s :%s %s %d %d",
-				user->nick,
-				i->second->command.c_str(),
-				i->second->source.c_str(),
+		Module* src = i->second->creator;
+		user->WriteNumeric(RPL_COMMANDS, "%s :%s %s %d %d",
+				user->nick.c_str(),
+				i->second->name.c_str(),
+				src ? src->ModuleSourceFile.c_str() : "<core>",
 				i->second->min_params,
 				i->second->Penalty);
 	}
-	user->WriteNumeric(704, "%s :End of COMMANDS list",user->nick);
+	user->WriteNumeric(RPL_COMMANDSEND, "%s :End of COMMANDS list",user->nick.c_str());
 	return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandCommands)