X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_modules.cpp;h=64ff81b812f1de883d45172ac2f7f7af057f8e02;hb=0f87ad0d4b97874823c94a5168a06dcd444ad559;hp=599eb611bc5166a66c23f7eb007eee779b8ae4b0;hpb=069a2ef21425007d092342c8c11ec28da2f410d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp
index 599eb611b..64ff81b81 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)
@@ -57,20 +52,22 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
 
 		if (user->HasPrivPermission("servers/auspex"))
 		{
-			std::string flags("Svsc");
+			std::string flags("SvcC");
 			int pos = 0;
-			for (int mult = 1; mult <= VF_SERVICEPROVIDER; mult *= 2, ++pos)
+			for (int mult = 1; mult <= VF_OPTCOMMON; mult *= 2, ++pos)
 				if (!(V.Flags & mult))
 					flags[pos] = '-';
 
-			user->WriteNumeric(702, "%s :0x%08lx %s %s :%s", user->nick.c_str(), (unsigned long)m, module_names[i].c_str(), flags.c_str(), V.version.c_str());
+			user->SendText(":%s 702 %s :%p %s %s :%s - %s", ServerInstance->Config->ServerName.c_str(),
+				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",user->nick.c_str(), module_names[i].c_str());
+			user->SendText(":%s 702 %s :%s %s", ServerInstance->Config->ServerName.c_str(),
+				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());
+	user->SendText(":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
 
 	return CMD_SUCCESS;
 }