X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_info%2Fcmd_modules.cpp;h=76ec6db7d04dc71d3bf2b5eaaa7010f2479dfc2e;hb=b4a174ee9c32d62ea6bf010e837e8c5b1c3d36a3;hp=ef1ee7dbe53abf2afb090e435cc1f49b2c2f97a5;hpb=30bd7bb39fb55a4b6b3075a1f8a7df47bc0e261f;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..76ec6db7d 100644
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -1,9 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007-2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -22,6 +27,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")
 {
@@ -31,11 +43,11 @@ 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
-	bool for_us = (parameters.empty() || parameters[0] == ServerInstance->Config->ServerName);
+	bool for_us = (parameters.empty() || irc::equals(parameters[0], ServerInstance->Config->ServerName));
 	if ((!for_us) || (!IS_LOCAL(user)))
 	{
 		if (!user->IsOper())
@@ -51,32 +63,28 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
 
 	const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
 
-  	for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
+	for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
 	{
 		Module* m = i->second;
 		Version V = m->GetVersion();
 
 		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 INSPIRCD_STATIC
-			user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s :%s", m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str()));
-#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()));
-#endif
+			const char* srcrev = m->ModuleDLLManager->GetVersion();
+			user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, srcrev ? srcrev : "*", flags, V.description);
 		}
 		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;
 }