Merge remote/local MODULES output

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11793 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 12 insertions, 15 deletions

diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp
index 70406330a..76cc29ac6 100644
--- a/src/commands/cmd_modules.cpp
+++ b/src/commands/cmd_modules.cpp
@@ -13,14 +13,6 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_MODULES_H__
-#define __CMD_MODULES_H__
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** Handle /MODULES. 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
@@ -31,7 +23,7 @@ class CommandModules : public Command
  public:
 	/** Constructor for modules.
 	 */
-	CommandModules ( Module* parent) : Command(parent,"MODULES",0,0) { syntax = "[debug]"; }
+	CommandModules ( Module* parent) : Command(parent,"MODULES",0,0) { syntax = "[server]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
@@ -39,11 +31,14 @@ class CommandModules : public Command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		if (parameters.size() >= 1)
+			return ROUTE_UNICAST(parameters[0]);
+		return ROUTE_LOCALONLY;
+	}
 };
 
-#endif
-
-
 /** Handle /MODULES
  */
 CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
@@ -63,14 +58,16 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
 				if (!(V.Flags & mult))
 					flags[pos] = '-';
 
-			user->WriteNumeric(702, "%s :0x%08lx %s %s :%s - %s", user->nick.c_str(),(unsigned long)m, module_names[i].c_str(), flags.c_str(), V.description.c_str(), V.version.c_str());
+			ServerInstance->DumpText(user, ":%s 702 %s :%p %s %s :%s - %s", ServerInstance->Config->ServerName,
+				user->nick.c_str(), (void*)m, module_names[i].c_str(), flags.c_str(), V.description.c_str(), V.version.c_str());
 		}
 		else
 		{
-			user->WriteNumeric(702, "%s :%s %s", user->nick.c_str(), module_names[i].c_str(), V.description.c_str());
+			ServerInstance->DumpText(user, ":%s 702 %s :%s %s", ServerInstance->Config->ServerName,
+				user->nick.c_str(), module_names[i].c_str(), V.description.c_str());
 		}
 	}
-	user->WriteNumeric(703, "%s :End of MODULES list",user->nick.c_str());
+	ServerInstance->DumpText(user, ":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName, user->nick.c_str());
 
 	return CMD_SUCCESS;
 }