m_spanningtree Rewrite /map

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

diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp
index e21df9b081fd240c75c2f58d88515143753985b7..d9fa7d5d5642f60779e3388513b91679e7fdd390 100644 (file)
--- a/src/commands/cmd_modules.cpp
+++ b/src/commands/cmd_modules.cpp
@@ -31,7 +31,12 @@ class CommandModules : public Command
  public:
        /** Constructor for modules.
         */
-       CommandModules ( Module* parent) : Command(parent,"MODULES",0,0) { syntax = "[server]"; }
+       CommandModules(Module* parent) : Command(parent,"MODULES",0,0)
+       {
+               Penalty = 4;
+               syntax = "[<servername>]";
+       }
+
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -51,14 +56,27 @@ class CommandModules : public Command
  */
 CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       if (parameters.size() >= 1 && parameters[0] != ServerInstance->Config->ServerName)
-               return CMD_SUCCESS;
+       // 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);
+       if ((!for_us) || (!IS_LOCAL(user)))
+       {
+               if (!user->IsOper())
+               {
+                       user->WriteNotice("*** You cannot check what modules other servers have loaded.");
+                       return CMD_FAILURE;
+               }
+
+               // From an oper and not for us, forward
+               if (!for_us)
+                       return CMD_SUCCESS;
+       }
 
-       std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
+       const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
 
-       for (unsigned int i = 0; i < module_names.size(); i++)
+       for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
        {
-               Module* m = ServerInstance->Modules->Find(module_names[i]);
+               Module* m = i->second;
                Version V = m->GetVersion();
 
                if (IS_LOCAL(user) && user->HasPrivPermission("servers/auspex"))
@@ -71,17 +89,17 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
 
 #ifdef PURE_STATIC
                        user->SendText(":%s 702 %s :%p %s %s :%s", ServerInstance->Config->ServerName.c_str(),
-                               user->nick.c_str(), (void*)m, module_names[i].c_str(), flags.c_str(), V.description.c_str());
+                               user->nick.c_str(), (void*)m, 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, module_names[i].c_str(), flags.c_str(), V.description.c_str(), srcrev.c_str());
+                               user->nick.c_str(), (void*)m, 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(), module_names[i].c_str(), V.description.c_str());
+                               user->nick.c_str(), 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());