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

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 3bbcaeda4..35b30f0d4 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -1,28 +1,18 @@
-/*     +------------------------------------+
- *     | Inspire Internet Relay Chat Daemon |
- *     +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *             <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- * the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
 #include "inspircd.h"
 #include "u_listmode.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides support for the +e channel mode */
 /* $ModDep: ../../include/u_listmode.h */
@@ -41,111 +31,111 @@
 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::Module(Me)
+	ModuleBanException() : be(this)
 	{
-		be = new BanException(ServerInstance);
-		ServerInstance->AddMode(be, 'e');
-	}
-	
-	virtual void Implements(char* List)
-	{
-		be->DoImplements(List);
-		List[I_On005Numeric] = List[I_OnCheckBan] = 1;
+		if (!ServerInstance->Modes->AddMode(&be))
+			throw ModuleException("Could not add new modes!");
+		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+
+		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(userrec* user, chanrec* 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 (ServerInstance->MatchText(user->GetFullRealHost(), it->mask) || ServerInstance->MatchText(user->GetFullHost(), it->mask) || (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;	
-	}
 
-	virtual void OnCleanup(int target_type, void* item)
-	{
-		be->DoCleanup(target_type, item);
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	ModResult OnCheckChannelBan(User* user, Channel* chan)
 	{
-		be->DoSyncChannel(chan, proto, opaque);
-	}
+		if (chan)
+		{
+			modelist *list = be.extItem.get(chan);
 
-	virtual void OnChannelDelete(chanrec* chan)
-	{
-		be->DoChannelDelete(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 OnRehash(const std::string &param)
+	void OnCleanup(int target_type, void* item)
 	{
-		be->DoRehash();
+		be.DoCleanup(target_type, item);
 	}
-	
-	virtual Version GetVersion()
+
+	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
-		return Version(1, 1, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
+		be.DoSyncChannel(chan, proto, opaque);
 	}
-	
-	virtual ~ModuleBanException()
+
+	void OnRehash(User* user)
 	{
-		ServerInstance->Modes->DelMode(be);
-		DELETE(be);	
+		be.DoRehash();
 	}
-};
 
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleBanExceptionFactory()
+	const char* OnRequest(Request* request)
 	{
+		return be.DoOnRequest(request);
 	}
-	
-	~ModuleBanExceptionFactory()
+
+	Version GetVersion()
 	{
+		return Version("Provides support for the +e channel mode", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
-	virtual Module* CreateModule(InspIRCd* Me)
+
+	~ModuleBanException()
 	{
-		return new ModuleBanException(Me);
+		ServerInstance->Modes->DelMode(&be);
+		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)