X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_info%2Fcmd_modules.cpp;h=04f470bcd932abadc37700ad33a3cdf6a959851f;hb=f1bfa8242c0a5b76bcff36c70103c2aae7cbdf5f;hp=ef1ee7dbe53abf2afb090e435cc1f49b2c2f97a5;hpb=c0aba5b728b0a921d95ec120aa638dab1520b42f;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 ef1ee7dbe..04f470bcd 100644
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -22,6 +22,13 @@
 #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)
 	: ServerTargetCommand(parent, "MODULES")
 {
@@ -65,18 +72,18 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
 					flags[pos] = '-';
 
 #ifdef INSPIRCD_STATIC
-			user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s :%s", m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str()));
+			user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, INSPIRCD_VERSION, flags, V.description);
 #else
 			std::string srcrev = m->ModuleDLLManager->GetVersion();
-			user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s :%s - %s", m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str(), srcrev.c_str()));
+			user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, srcrev.empty() ? "*" : srcrev, flags, V.description);
 #endif
 		}
 		else
 		{
-			user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s", m->ModuleSourceFile.c_str(), V.description.c_str()));
+			user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, '*', '*', V.description);
 		}
 	}
-	user->WriteRemoteNumeric(703, "End of MODULES list");
+	user->WriteRemoteNumeric(RPL_ENDOFMODLIST, "End of MODULES list");
 
 	return CMD_SUCCESS;
 }