X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_info%2Fcmd_modules.cpp;h=7212e9525331e173403aca1dec4665d4122e99bc;hb=c6e40d36b42a7ebf832c3a57d2816a47ee9c9a76;hp=0a1420e1364b3c3ac4e7dd5dc744b86e8bdd0b8a;hpb=06bc8df45045a3d1fdc45f793abf7ba72b7403b1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp
index 0a1420e13..7212e9525 100644
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -22,8 +22,15 @@
 #include "inspircd.h"
 #include "core_info.h"
 
+enum
+{
+	// From ircd-ratbox with an InspIRCd-specific format.
+	RPL_MODLIST = 702,
+	RPL_ENDOFMODLIST = 703
+};
+
 CommandModules::CommandModules(Module* parent)
-	: Command(parent, "MODULES", 0, 0)
+	: ServerTargetCommand(parent, "MODULES")
 {
 	Penalty = 4;
 	syntax = "[<servername>]";
@@ -31,7 +38,7 @@ CommandModules::CommandModules(Module* parent)
 
 /** Handle /MODULES
  */
-CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandModules::Handle(User* user, const Params& parameters)
 {
 	// Don't ask remote servers about their modules unless the local user asking is an oper
 	// 2.0 asks anyway, so let's handle that the same way
@@ -58,35 +65,21 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
 
 		if (IS_LOCAL(user) && user->HasPrivPermission("servers/auspex"))
 		{
-			std::string flags("vcC");
-			int pos = 0;
+			std::string flags("VCO");
+			size_t pos = 0;
 			for (int mult = 2; mult <= VF_OPTCOMMON; mult *= 2, ++pos)
 				if (!(V.Flags & mult))
 					flags[pos] = '-';
 
-#ifdef PURE_STATIC
-			user->SendText(":%s 702 %s :%s %s :%s", ServerInstance->Config->ServerName.c_str(),
-				user->nick.c_str(), m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str());
-#else
 			std::string srcrev = m->ModuleDLLManager->GetVersion();
-			user->SendText(":%s 702 %s :%s %s :%s - %s", ServerInstance->Config->ServerName.c_str(),
-				user->nick.c_str(), m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str(), srcrev.c_str());
-#endif
+			user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, srcrev.empty() ? "*" : srcrev, flags, V.description);
 		}
 		else
 		{
-			user->SendText(":%s 702 %s :%s %s", ServerInstance->Config->ServerName.c_str(),
-				user->nick.c_str(), m->ModuleSourceFile.c_str(), V.description.c_str());
+			user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, '*', '*', V.description);
 		}
 	}
-	user->SendText(":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
+	user->WriteRemoteNumeric(RPL_ENDOFMODLIST, "End of MODULES list");
 
 	return CMD_SUCCESS;
 }
-
-RouteDescriptor CommandModules::GetRouting(User* user, const std::vector<std::string>& parameters)
-{
-	if (parameters.size() >= 1)
-		return ROUTE_UNICAST(parameters[0]);
-	return ROUTE_LOCALONLY;
-}