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

[user/henk/code/inspircd.git] / src / modules / m_servprotect.cpp

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 34f730c629ce162e7470e4885e4862204b51850a..a5d7a82e43bc9850d737fa94b0f37046d85a744e 100644 (file)
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -20,6 +20,16 @@
 
 
 #include "inspircd.h"
+#include "modules/whois.h"
+
+enum
+{
+       // From AustHex.
+       RPL_WHOISSERVICE = 310,
+
+       // From UnrealIRCd.
+       ERR_KILLDENY = 485
+};
 
 /** Handles user mode +k
  */
@@ -28,7 +38,7 @@ class ServProtectMode : public ModeHandler
  public:
        ServProtectMode(Module* Creator) : ModeHandler(Creator, "servprotect", 'k', PARAM_NONE, MODETYPE_USER) { oper = true; }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
        {
                /* Because this returns MODEACTION_DENY all the time, there is only ONE
                 * way to add this mode and that is at client introduction in the UID command,
@@ -62,7 +72,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
        {
                if (whois.GetTarget()->IsModeSet(bm))
                {
-                       whois.SendLine(310, ":is a Network Service on " + ServerInstance->Config->Network);
+                       whois.SendLine(RPL_WHOISSERVICE, "is a Network Service on " + ServerInstance->Config->Network);
                }
        }
 
@@ -73,6 +83,10 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
                 */
                if (!adding && chan && IS_LOCAL(user) && !param.empty())
                {
+                       const PrefixMode* const pm = mh->IsPrefixMode();
+                       if (!pm)
+                               return MOD_RES_PASSTHRU;
+
                        /* Check if the parameter is a valid nick/uuid
                         */
                        User *u = ServerInstance->FindNick(param);
@@ -83,7 +97,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
                                 * This includes any prefix permission mode, even those registered in other modules, e.g. +qaohv. Using ::ModeString()
                                 * here means that the number of modes is restricted to only modes the user has, limiting it to as short a loop as possible.
                                 */
-                               if (u->IsModeSet(bm) && memb && memb->hasMode(mh->GetModeChar()))
+                               if ((u->IsModeSet(bm)) && (memb) && (memb->HasMode(pm)))
                                {
                                        /* BZZZT, Denied! */
                                        user->WriteNumeric(ERR_CHANOPRIVSNEEDED, chan->name, InspIRCd::Format("You are not permitted to remove privileges from %s services", ServerInstance->Config->Network.c_str()));
@@ -102,7 +116,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
 
                if (dst->IsModeSet(bm))
                {
-                       src->WriteNumeric(485, InspIRCd::Format("You are not permitted to kill %s services!", ServerInstance->Config->Network.c_str()));
+                       src->WriteNumeric(ERR_KILLDENY, InspIRCd::Format("You are not permitted to kill %s services!", ServerInstance->Config->Network.c_str()));
                        ServerInstance->SNO->WriteGlobalSno('a', src->nick+" tried to kill service "+dst->nick+" ("+reason+")");
                        return MOD_RES_DENY;
                }
@@ -120,9 +134,9 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnWhoisLine(Whois::Context& whois, unsigned int& numeric, std::string& text) CXX11_OVERRIDE
+       ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE
        {
-               return ((numeric == 319) && whois.GetTarget()->IsModeSet(bm)) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
+               return ((numeric.GetNumeric() == 319) && whois.GetTarget()->IsModeSet(bm)) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
        }
 };