X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=e342e7dab2dffd92ded0ca0eafddf7114260e726;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=1bc05a4ef1f6343f9e30989c067a63b0bb241349;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 1bc05a4ef..e342e7dab 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -30,16 +30,25 @@ class ModuleOverride : public Module
 {
 	bool RequireKey;
 	bool NoisyOverride;
+	ChanModeReference topiclock;
+	ChanModeReference inviteonly;
+	ChanModeReference key;
+	ChanModeReference limit;
 
  public:
+	ModuleOverride()
+		: topiclock(this, "topiclock")
+		, inviteonly(this, "inviteonly")
+		, key(this, "key")
+		, limit(this, "limit")
+	{
+	}
 
 	void init() CXX11_OVERRIDE
 	{
 		// read our config options (main config file)
 		OnRehash(NULL);
 		ServerInstance->SNO->EnableSnomask('v', "OVERRIDE");
-		Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	void OnRehash(User* user) CXX11_OVERRIDE
@@ -68,7 +77,7 @@ class ModuleOverride : public Module
 	{
 		if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC"))
 		{
-			if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetPrefixValue(source) < HALFOP_VALUE))
+			if (!channel->HasUser(source) || (channel->IsModeSet(topiclock) && channel->GetPrefixValue(source) < HALFOP_VALUE))
 			{
 				ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to change a topic on "+channel->name);
 			}
@@ -120,7 +129,7 @@ class ModuleOverride : public Module
 		{
 			if (chan)
 			{
-				if (chan->IsModeSet('i') && (CanOverride(user,"INVITE")))
+				if (chan->IsModeSet(inviteonly) && (CanOverride(user,"INVITE")))
 				{
 					if (!IS_LOCAL(user)->IsInvited(chan))
 					{
@@ -138,7 +147,7 @@ class ModuleOverride : public Module
 					return MOD_RES_ALLOW;
 				}
 
-				if (chan->IsModeSet('k') && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k'))
+				if (chan->IsModeSet(key) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter(key))
 				{
 					if (RequireKey && keygiven != "override")
 					{
@@ -153,7 +162,7 @@ class ModuleOverride : public Module
 					return MOD_RES_ALLOW;
 				}
 
-				if (chan->IsModeSet('l') && (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter('l'))) && (CanOverride(user,"LIMIT")))
+				if (chan->IsModeSet(limit) && (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter(limit))) && (CanOverride(user,"LIMIT")))
 				{
 					if (RequireKey && keygiven != "override")
 					{