Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[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 b8a1805b0a8020c5e2bcf8316451daf86d100dbd..2a15b43ed841fa675b18cf2c1b186410414dc534 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
@@ -49,8 +54,11 @@ class CommandModules : public Command
 
 /** Handle /MODULES
  */
-CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
+CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, User *user)
 {
+       if (parameters.size() >= 1 && parameters[0] != ServerInstance->Config->ServerName)
+               return CMD_SUCCESS;
+
        std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
 
        for (unsigned int i = 0; i < module_names.size(); i++)
@@ -58,7 +66,7 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
                Module* m = ServerInstance->Modules->Find(module_names[i]);
                Version V = m->GetVersion();
 
-               if (user->HasPrivPermission("servers/auspex"))
+               if (IS_LOCAL(user) && user->HasPrivPermission("servers/auspex"))
                {
                        std::string flags("SvcC");
                        int pos = 0;