Fix incorrect ModResult for noctcp user target.

[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 fa8c2aebbc61c2c91be428d09f69d91cc67830da..d68c8b9fdc00ccdeae035b2fd1a75ebf2f64bdea 100644 (file)
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -38,11 +38,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())
@@ -71,12 +71,8 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
                                if (!(V.Flags & mult))
                                        flags[pos] = '-';
 
-#ifdef INSPIRCD_STATIC
-                       user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, INSPIRCD_VERSION, flags, V.description);
-#else
                        std::string srcrev = m->ModuleDLLManager->GetVersion();
                        user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, srcrev.empty() ? "*" : srcrev, flags, V.description);
-#endif
                }
                else
                {