X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=fd09dd6ec96178fb283b56c63ac9316f6e1d3347;hb=c46f8a368c42f64284244f3d2dfc022a383294fa;hp=04c5166c08ed09d3816c8a8d3e6dc7628a5bfaec;hpb=ce78080782c261aed2c0314bc8c66babc1369be2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 04c5166c0..fd09dd6ec 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -25,6 +25,7 @@
 
 
 #include "inspircd.h"
+#include "modules/invite.h"
 
 class ModuleOverride : public Module
 {
@@ -34,15 +35,13 @@ class ModuleOverride : public Module
 	ChanModeReference inviteonly;
 	ChanModeReference key;
 	ChanModeReference limit;
+	Invite::API invapi;
 
-	static bool IsOverride(unsigned int userlevel, const std::string& modeline)
+	static bool IsOverride(unsigned int userlevel, const Modes::ChangeList::List& list)
 	{
-		for (std::string::const_iterator i = modeline.begin(); i != modeline.end(); ++i)
+		for (Modes::ChangeList::List::const_iterator i = list.begin(); i != list.end(); ++i)
 		{
-			ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
-			if (!mh)
-				continue;
-
+			ModeHandler* mh = i->mh;
 			if (mh->GetLevelRequired() > userlevel)
 				return true;
 		}
@@ -59,7 +58,7 @@ class ModuleOverride : public Module
 		}
 
 		if (NoisyOverride)
-			chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass %s", chan->name.c_str(), user->nick.c_str(), bypasswhat);
+			chan->WriteNotice(InspIRCd::Format("%s used oper override to bypass %s", user->nick.c_str(), bypasswhat));
 		ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass " + mode + " on " + chan->name);
 		return MOD_RES_ALLOW;
 	}
@@ -70,6 +69,7 @@ class ModuleOverride : public Module
 		, inviteonly(this, "inviteonly")
 		, key(this, "key")
 		, limit(this, "limit")
+		, invapi(this)
 	{
 	}
 
@@ -121,7 +121,8 @@ class ModuleOverride : public Module
 		if (source->IsOper() && CanOverride(source,"KICK"))
 		{
 			// If the kicker's status is less than the target's,			or	the kicker's status is less than or equal to voice
-			if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE))
+			if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE) ||
+			    (memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->getRank() == HALFOP_VALUE))
 			{
 				ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")");
 				return MOD_RES_ALLOW;
@@ -130,23 +131,42 @@ class ModuleOverride : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
+	ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE
 	{
 		if (!channel)
 			return MOD_RES_PASSTHRU;
 		if (!source->IsOper() || !IS_LOCAL(source))
 			return MOD_RES_PASSTHRU;
 
+		const Modes::ChangeList::List& list = modes.getlist();
 		unsigned int mode = channel->GetPrefixValue(source);
 
-		if (!IsOverride(mode, parameters[1]))
+		if (!IsOverride(mode, list))
 			return MOD_RES_PASSTHRU;
 
 		if (CanOverride(source, "MODE"))
 		{
-			std::string msg = source->nick+" overriding modes:";
-			for(unsigned int i=0; i < parameters.size(); i++)
-				msg += " " + parameters[i];
+			std::string msg = source->nick + " overriding modes: ";
+
+			// Construct a MODE string in the old format for sending it as a snotice
+			std::string params;
+			char pm = 0;
+			for (Modes::ChangeList::List::const_iterator i = list.begin(); i != list.end(); ++i)
+			{
+				const Modes::Change& item = *i;
+				if (!item.param.empty())
+					params.append(1, ' ').append(item.param);
+
+				char wanted_pm = (item.adding ? '+' : '-');
+				if (wanted_pm != pm)
+				{
+					pm = wanted_pm;
+					msg += pm;
+				}
+
+				msg += item.mh->GetModeChar();
+			}
+			msg += params;
 			ServerInstance->SNO->WriteGlobalSno('v',msg);
 			return MOD_RES_ALLOW;
 		}
@@ -161,7 +181,7 @@ class ModuleOverride : public Module
 			{
 				if (chan->IsModeSet(inviteonly) && (CanOverride(user,"INVITE")))
 				{
-					if (!IS_LOCAL(user)->IsInvited(chan))
+					if (!invapi->IsInvited(user, chan))
 						return HandleJoinOverride(user, chan, keygiven, "invite-only", "+i");
 					return MOD_RES_ALLOW;
 				}