X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_servprotect.cpp;h=97670237b4fee551079f29398bf8e42e147ecca4;hb=9de9231380d42955a13f07d7843897c77af704e4;hp=26453020f6ce8376d9e576cf9bf956ea75603ac4;hpb=9e123ad1218e8c3ff29cee2a8a6e1b4b6f56b33b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 26453020f..97670237b 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -42,12 +42,14 @@ class ServProtectMode : public ModeHandler
 	}
 };
 
-class ModuleServProtectMode : public Module
+class ModuleServProtectMode : public Module, public Whois::EventListener, public Whois::LineEventListener
 {
 	ServProtectMode bm;
  public:
 	ModuleServProtectMode()
-		: bm(this)
+		: Whois::EventListener(this)
+		, Whois::LineEventListener(this)
+		, bm(this)
 	{
 	}
 
@@ -56,11 +58,11 @@ class ModuleServProtectMode : public Module
 		return Version("Provides usermode +k to protect services from kicks, kills, and mode changes.", VF_VENDOR);
 	}
 
-	void OnWhois(User* user, User* dest) CXX11_OVERRIDE
+	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
 	{
-		if (dest->IsModeSet(bm))
+		if (whois.GetTarget()->IsModeSet(bm))
 		{
-			ServerInstance->SendWhoisLine(user, dest, 310, dest->nick+" :is a Network Service on "+ServerInstance->Config->Network);
+			whois.SendLine(310, "is a Network Service on " + ServerInstance->Config->Network);
 		}
 	}
 
@@ -71,6 +73,10 @@ class ModuleServProtectMode : public Module
 		 */
 		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);
@@ -81,10 +87,10 @@ class ModuleServProtectMode : public Module
 				 * 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;
 				}
 			}
@@ -100,7 +106,7 @@ class ModuleServProtectMode : public Module
 
 		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;
 		}
@@ -111,17 +117,16 @@ class ModuleServProtectMode : public Module
 	{
 		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(User* src, User* dst, int &numeric, std::string &text) CXX11_OVERRIDE
+	ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
-		return ((src != dst) && (numeric == 319) && dst->IsModeSet(bm)) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
+		return ((numeric.GetNumeric() == 319) && whois.GetTarget()->IsModeSet(bm)) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}
 };