Merge v2.0.23 and v2.0.24 into master.

[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 cee3708704ed04d5d6355db9da96931d32684891..ef1ee7dbe53abf2afb090e435cc1f49b2c2f97a5 100644 (file)
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -23,7 +23,7 @@
 #include "core_info.h"
 
 CommandModules::CommandModules(Module* parent)
-       : Command(parent, "MODULES", 0, 0)
+       : ServerTargetCommand(parent, "MODULES")
 {
        Penalty = 4;
        syntax = "[<servername>]";
@@ -58,35 +58,25 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
 
                if (IS_LOCAL(user) && user->HasPrivPermission("servers/auspex"))
                {
-                       std::string flags("SvcC");
+                       std::string flags("vcC");
                        int pos = 0;
-                       for (int mult = 1; mult <= VF_OPTCOMMON; mult *= 2, ++pos)
+                       for (int mult = 2; mult <= VF_OPTCOMMON; mult *= 2, ++pos)
                                if (!(V.Flags & mult))
                                        flags[pos] = '-';
 
-#ifdef PURE_STATIC
-                       user->SendText(":%s 702 %s :%p %s %s :%s", ServerInstance->Config->ServerName.c_str(),
-                               user->nick.c_str(), (void*)m, m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str());
+#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->SendText(":%s 702 %s :%p %s %s :%s - %s", ServerInstance->Config->ServerName.c_str(),
-                               user->nick.c_str(), (void*)m, m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str(), srcrev.c_str());
+                       user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s :%s - %s", m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str(), srcrev.c_str()));
 #endif
                }
                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(702, InspIRCd::Format("%s %s", m->ModuleSourceFile.c_str(), V.description.c_str()));
                }
        }
-       user->SendText(":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
+       user->WriteRemoteNumeric(703, "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;
-}