Merge pull request #677 from Robby-/master-dnsblzline

[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 0445235dc795f6821de7853ee98c0fae38b5fc89..97670237b4fee551079f29398bf8e42e147ecca4 100644 (file)
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -62,7 +62,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(310, "is a Network Service on " + ServerInstance->Config->Network);
                }
        }
 
@@ -73,6 +73,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,10 +87,10 @@ 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, "%s :You are not permitted to remove privileges from %s services", chan->name.c_str(), ServerInstance->Config->Network.c_str());
+                                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, chan->name, InspIRCd::Format("You are not permitted to remove privileges from %s services", ServerInstance->Config->Network.c_str()));
                                        return MOD_RES_DENY;
                                }
                        }
@@ -102,7 +106,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
 
                if (dst->IsModeSet(bm))
                {
-                       src->WriteNumeric(485, ":You are not permitted to kill %s services!", ServerInstance->Config->Network.c_str());
+                       src->WriteNumeric(485, 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;
                }
@@ -113,17 +117,16 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
        {
                if (memb->user->IsModeSet(bm))
                {
-                       src->WriteNumeric(ERR_RESTRICTED, "%s :You are not permitted to kick services",
-                               memb->chan->name.c_str());
+                       src->WriteNumeric(ERR_RESTRICTED, memb->chan->name, "You are not permitted to kick services");
                        return MOD_RES_DENY;
                }
 
                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;
        }
 };