Use CommandBase::Params instead of std::vector<std::string>.

[user/henk/code/inspircd.git] / src / coremods / core_info / cmd_modules.cpp

diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp
index ef1ee7dbe53abf2afb090e435cc1f49b2c2f97a5..952b6bca25ca44f651df2599346550b1f4c88141 100644 (file)
--- 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")
 {
@@ -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,25 +65,25 @@ 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 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;
 }