X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_exemptchanops.cpp;h=8d6d65af2329c050dff0fa4e6c319909da0731b7;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=a5c79169b04b2ccfc2545791d8e9dc94f1ad6735;hpb=6c52aebb50e013483d079f0ef75a01dffd866141;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index a5c79169b..8d6d65af2 100644
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "u_listmode.h"
 
@@ -52,26 +58,80 @@ class ExemptChanOps : public ListModeBase
 	}
 };
 
-class ModuleExemptChanOps : public Module
+class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std::string&>
 {
+ public:
 	ExemptChanOps ec;
+	ExemptHandler(Module* me) : ec(me) {}
+	
+	ModeHandler* FindMode(const std::string& mid)
+	{
+		if (mid.length() == 1)
+			return ServerInstance->Modes->FindMode(mid[0], MODETYPE_CHANNEL);
+		for(char c='A'; c <= 'z'; c++)
+		{
+			ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
+			if (mh && mh->name == mid)
+				return mh;
+		}
+		return NULL;
+	}
+
+	ModResult Call(User* user, Channel* chan, const std::string& restriction)
+	{
+		unsigned int mypfx = chan->GetPrefixValue(user);
+		std::string minmode;
+
+		modelist* list = ec.extItem.get(chan);
+
+		if (list)
+		{
+			for (modelist::iterator i = list->begin(); i != list->end(); ++i)
+			{
+				std::string::size_type pos = (*i).mask.find(':');
+				if (pos == std::string::npos)
+					continue;
+				if ((*i).mask.substr(0,pos) == restriction)
+					minmode = (*i).mask.substr(pos + 1);
+			}
+		}
+
+		ModeHandler* mh = FindMode(minmode);
+		if (mh && mypfx >= mh->GetPrefixRank())
+			return MOD_RES_ALLOW;
+		if (mh || minmode == "*")
+			return MOD_RES_DENY;
+
+		return ServerInstance->HandleOnCheckExemption.Call(user, chan, restriction);
+	}
+};
+
+class ModuleExemptChanOps : public Module
+{
 	std::string defaults;
+	ExemptHandler eh;
 
  public:
 
-	ModuleExemptChanOps() : ec(this)
+	ModuleExemptChanOps() : eh(this)
 	{
 	}
 
 	void init()
 	{
-		ServerInstance->Modules->AddService(ec);
-		Implementation eventlist[] = { I_OnChannelDelete, I_OnChannelRestrictionApply, I_OnRehash, I_OnSyncChannel };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		ServerInstance->Modules->AddService(eh.ec);
+		Implementation eventlist[] = { I_OnRehash, I_OnSyncChannel };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		ServerInstance->OnCheckExemption = &eh;
 
 		OnRehash(NULL);
 	}
 
+	~ModuleExemptChanOps()
+	{
+		ServerInstance->OnCheckExemption = &ServerInstance->HandleOnCheckExemption;
+	}
+
 	Version GetVersion()
 	{
 		return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR);
@@ -79,50 +139,12 @@ class ModuleExemptChanOps : public Module
 
 	void OnRehash(User* user)
 	{
-		defaults = ServerInstance->Config->ConfValue("exemptchanops")->getString("defaults");
-		ec.DoRehash();
+		eh.ec.DoRehash();
 	}
 
 	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
-		ec.DoSyncChannel(chan, proto, opaque);
-	}
-
-	ModResult OnChannelRestrictionApply(User* user, Channel* chan, const char* restriction)
-	{
-		unsigned int mypfx = chan->GetPrefixValue(user);
-		irc::spacesepstream defaultstream(defaults);
-		char minmode = 0;
-		std::string current;
-
-		while (defaultstream.GetToken(current))
-		{
-			std::string::size_type pos = current.find(':');
-			if (pos == std::string::npos)
-				continue;
-			if (current.substr(0,pos) == restriction)
-				minmode = current[pos+1];
-		}
-		modelist* list = ec.extItem.get(chan);
-
-		if (list)
-		{
-			for (modelist::iterator i = list->begin(); i != list->end(); ++i)
-			{
-				std::string::size_type pos = (**i).mask.find(':');
-				if (pos == std::string::npos)
-					continue;
-				if ((**i).mask.substr(0,pos) == restriction)
-					minmode = (**i).mask[pos+1];
-			}
-		}
-
-		ModeHandler* mh = ServerInstance->Modes->FindMode(minmode, MODETYPE_CHANNEL);
-		if (mh && mypfx >= mh->GetPrefixRank())
-			return MOD_RES_ALLOW;
-		if (mh || minmode == '*')
-			return MOD_RES_DENY;
-		return MOD_RES_PASSTHRU;
+		eh.ec.DoSyncChannel(chan, proto, opaque);
 	}
 };