X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=346d38b9f32b68518898689746f223e67a148a55;hb=a8b146419b2aae36da25b7202292528efd3158a9;hp=e342e7dab2dffd92ded0ca0eafddf7114260e726;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index e342e7dab..346d38b9f 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -35,6 +35,20 @@ class ModuleOverride : public Module
 	ChanModeReference key;
 	ChanModeReference limit;
 
+	static bool IsOverride(unsigned int userlevel, const std::string& modeline)
+	{
+		for (std::string::const_iterator i = modeline.begin(); i != modeline.end(); ++i)
+		{
+			ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
+			if (!mh)
+				continue;
+
+			if (mh->GetLevelRequired() > userlevel)
+				return true;
+		}
+		return false;
+	}
+
  public:
 	ModuleOverride()
 		: topiclock(this, "topiclock")
@@ -46,14 +60,12 @@ class ModuleOverride : public Module
 
 	void init() CXX11_OVERRIDE
 	{
-		// read our config options (main config file)
-		OnRehash(NULL);
 		ServerInstance->SNO->EnableSnomask('v', "OVERRIDE");
 	}
 
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		// re-read our config options on a rehash
+		// re-read our config options
 		ConfigTag* tag = ServerInstance->Config->ConfValue("override");
 		NoisyOverride = tag->getBool("noisy");
 		RequireKey = tag->getBool("requirekey");
@@ -105,14 +117,17 @@ class ModuleOverride : public Module
 
 	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
 	{
-		if (!source || !channel)
+		if (!channel)
 			return MOD_RES_PASSTHRU;
 		if (!source->IsOper() || !IS_LOCAL(source))
 			return MOD_RES_PASSTHRU;
 
 		unsigned int mode = channel->GetPrefixValue(source);
 
-		if (mode < HALFOP_VALUE && CanOverride(source, "MODE"))
+		if (!IsOverride(mode, parameters[1]))
+			return MOD_RES_PASSTHRU;
+
+		if (CanOverride(source, "MODE"))
 		{
 			std::string msg = source->nick+" overriding modes:";
 			for(unsigned int i=0; i < parameters.size(); i++)