X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=35b30f0d46aaf14843782cb9ebfd090da050bc10;hb=4a64082e31c3c3dfa97a1edfb8a3c97fe8d32ea7;hp=2066cc5248f0e68ccacbce7f75c5313502af4e09;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 2066cc524..35b30f0d4 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -13,7 +13,6 @@
 
 #include "inspircd.h"
 #include "u_listmode.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides support for the +e channel mode */
 /* $ModDep: ../../include/u_listmode.h */
@@ -32,115 +31,109 @@
 class BanException : public ListModeBase
 {
  public:
-	BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", "348", "349", true) { }
+	BanException(Module* Creator) : ListModeBase(Creator, 'e', "End of Channel Exception List", 348, 349, true) { }
 };
 
 
 class ModuleBanException : public Module
 {
-	BanException* be;
-	
+	BanException be;
 
 public:
-	ModuleBanException(InspIRCd* Me)
-	: Module(Me)
+	ModuleBanException() : be(this)
 	{
-		be = new BanException(ServerInstance);
-		if (!ServerInstance->AddMode(be))
+		if (!ServerInstance->Modes->AddMode(&be))
 			throw ModuleException("Could not add new modes!");
 		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
-		//be->DoImplements(List);
-		Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan };
-		Me->Modules->Attach(list, this, 4);
+		be.DoImplements(this);
+		Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
+		ServerInstance->Modules->Attach(list, this, 5);
 
 	}
-	
-	virtual void On005Numeric(std::string &output)
+
+	void On005Numeric(std::string &output)
 	{
 		output.append(" EXCEPTS=e");
 	}
 
-	virtual int OnCheckBan(User* user, Channel* chan)
+	ModResult OnExtBanCheck(User *user, Channel *chan, char type)
 	{
 		if (chan != NULL)
 		{
-			modelist* list;
-			chan->GetExt(be->GetInfoKey(), list);
-			
-			if (list)
+			modelist *list = be.extItem.get(chan);
+
+			if (!list)
+				return MOD_RES_PASSTHRU;
+
+			for (modelist::iterator it = list->begin(); it != list->end(); it++)
 			{
-				char mask[MAXBUF];
-				snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
-				for (modelist::iterator it = list->begin(); it != list->end(); it++)
+				if (it->mask[0] != type || it->mask[1] != ':')
+					continue;
+
+				if (chan->CheckBan(user, it->mask.substr(2)))
 				{
-					if (match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
-					{
-						// They match an entry on the list, so let them in.
-						return 1;
-					}
+					// They match an entry on the list, so let them pass this.
+					return MOD_RES_ALLOW;
 				}
-				return 0;
 			}
-			// or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
 		}
-		return 0;	
+
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnCleanup(int target_type, void* item)
+	ModResult OnCheckChannelBan(User* user, Channel* chan)
 	{
-		be->DoCleanup(target_type, item);
+		if (chan)
+		{
+			modelist *list = be.extItem.get(chan);
+
+			if (!list)
+			{
+				// No list, proceed normally
+				return MOD_RES_PASSTHRU;
+			}
+
+			for (modelist::iterator it = list->begin(); it != list->end(); it++)
+			{
+				if (chan->CheckBan(user, it->mask))
+				{
+					// They match an entry on the list, so let them in.
+					return MOD_RES_ALLOW;
+				}
+			}
+		}
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+	void OnCleanup(int target_type, void* item)
 	{
-		be->DoSyncChannel(chan, proto, opaque);
+		be.DoCleanup(target_type, item);
 	}
 
-	virtual void OnChannelDelete(Channel* chan)
+	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
-		be->DoChannelDelete(chan);
+		be.DoSyncChannel(chan, proto, opaque);
 	}
 
-	virtual void OnRehash(User* user, const std::string &param)
+	void OnRehash(User* user)
 	{
-		be->DoRehash();
+		be.DoRehash();
 	}
 
-	virtual char* OnRequest(Request* request)
+	const char* OnRequest(Request* request)
 	{
-		ListModeRequest* LM = (ListModeRequest*)request;
-		if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
-		{
-			modelist* list;
-			LM->chan->GetExt(be->GetInfoKey(), list);
-			if (list)
-			{
-				char mask[MAXBUF];
-				snprintf(mask, MAXBUF, "%s!%s@%s", LM->user->nick, LM->user->ident, LM->user->GetIPString());
-				for (modelist::iterator it = list->begin(); it != list->end(); it++)
-				{
-					if (match(LM->user->GetFullRealHost(), it->mask.c_str()) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
-					{
-						// They match an entry
-						return (char*)it->mask.c_str();
-					}
-				}
-				return NULL;
-			}
-		}
-		return NULL;
+		return be.DoOnRequest(request);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version(1, 1, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the +e channel mode", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
-	virtual ~ModuleBanException()
+
+	~ModuleBanException()
 	{
-		ServerInstance->Modes->DelMode(be);
-		delete be;
+		ServerInstance->Modes->DelMode(&be);
 		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
 };