X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=7155e7e76f797dfbe220a7473276e96fbd78051f;hb=4047a143fc1d16350db70c94b9ea77d79de05714;hp=69f4b3bca7c1bf876f880eeddf0c58572f056791;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 69f4b3bca..7155e7e76 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -25,22 +25,37 @@
 
 
 #include "inspircd.h"
+#include "modules/invite.h"
+
+class Override : public SimpleUserModeHandler
+{
+ public:
+	Override(Module* Creator) : SimpleUserModeHandler(Creator, "override", 'O')
+	{
+		oper = true;
+		if (!ServerInstance->Config->ConfValue("override")->getBool("enableumode"))
+			DisableAutoRegister();
+	}
+};
 
 class ModuleOverride : public Module
 {
 	bool RequireKey;
 	bool NoisyOverride;
+	bool UmodeEnabled;
+	Override ou;
 	ChanModeReference topiclock;
 	ChanModeReference inviteonly;
 	ChanModeReference key;
 	ChanModeReference limit;
+	Invite::API invapi;
 
 	static bool IsOverride(unsigned int userlevel, const Modes::ChangeList::List& list)
 	{
 		for (Modes::ChangeList::List::const_iterator i = list.begin(); i != list.end(); ++i)
 		{
 			ModeHandler* mh = i->mh;
-			if (mh->GetLevelRequired() > userlevel)
+			if (mh->GetLevelRequired(i->adding) > userlevel)
 				return true;
 		}
 		return false;
@@ -56,23 +71,27 @@ 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;
 	}
 
  public:
 	ModuleOverride()
-		: topiclock(this, "topiclock")
+		: UmodeEnabled(false)
+		, ou(this)
+		, topiclock(this, "topiclock")
 		, inviteonly(this, "inviteonly")
 		, key(this, "key")
 		, limit(this, "limit")
+		, invapi(this)
 	{
 	}
 
 	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->SNO->EnableSnomask('v', "OVERRIDE");
+		UmodeEnabled = ServerInstance->Config->ConfValue("override")->getBool("enableumode");
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
@@ -90,8 +109,11 @@ class ModuleOverride : public Module
 
 	bool CanOverride(User* source, const char* token)
 	{
-		std::string tokenlist = source->oper->getConfig("override");
+		// If we require oper override umode (+O) but it is not set
+		if (UmodeEnabled && !source->IsModeSet(ou))
+			return false;
 
+		std::string tokenlist = source->oper->getConfig("override");
 		// its defined or * is set, return its value as a boolean for if the token is set
 		return ((tokenlist.find(token, 0) != std::string::npos) || (tokenlist.find("*", 0) != std::string::npos));
 	}
@@ -118,7 +140,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;
@@ -177,7 +200,7 @@ class ModuleOverride : public Module
 			{
 				if (chan->IsModeSet(inviteonly) && (CanOverride(user,"INVITE")))
 				{
-					if (!user->IsInvited(chan))
+					if (!invapi->IsInvited(user, chan))
 						return HandleJoinOverride(user, chan, keygiven, "invite-only", "+i");
 					return MOD_RES_ALLOW;
 				}
@@ -185,7 +208,7 @@ class ModuleOverride : public Module
 				if (chan->IsModeSet(key) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter(key))
 					return HandleJoinOverride(user, chan, keygiven, "the channel key", "+k");
 
-				if (chan->IsModeSet(limit) && (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter(limit))) && (CanOverride(user,"LIMIT")))
+				if (chan->IsModeSet(limit) && (chan->GetUserCounter() >= ConvToNum<size_t>(chan->GetModeParameter(limit))) && (CanOverride(user,"LIMIT")))
 					return HandleJoinOverride(user, chan, keygiven, "the channel limit", "+l");
 
 				if (chan->IsBanned(user) && CanOverride(user,"BANWALK"))