X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=ddf2fcb87efc7fb3c6e11224af263dedfd45998f;hb=76f9f4b47a16888d93bdb6122de0e1f6d7965f4b;hp=34a52f82b47ff07685b160919648091eb5009193;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 34a52f82b..ddf2fcb87 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-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -31,166 +31,98 @@
 class BanException : public ListModeBase
 {
  public:
-	BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", 348, 349, true) { }
+	BanException(Module* Creator) : ListModeBase(Creator, "banexception", '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->Modes->AddMode(be))
+		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_OnCheckBan, I_OnCheckExtBan, I_OnCheckStringExtBan };
-		Me->Modules->Attach(list, this, 6);
+		be.DoImplements(this);
+		Implementation list[] = { I_OnRehash, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
+		ServerInstance->Modules->Attach(list, this, 4);
 
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::string &output)
 	{
 		output.append(" EXCEPTS=e");
 	}
 
-	virtual int OnCheckExtBan(User *user, Channel *chan, char type)
+	ModResult OnExtBanCheck(User *user, Channel *chan, char type)
 	{
 		if (chan != NULL)
 		{
-			modelist *list;
-			chan->GetExt(be->GetInfoKey(), list);
+			modelist *list = be.extItem.get(chan);
 
 			if (!list)
-				return 0;
+				return MOD_RES_PASSTHRU;
 
-			std::string mask = std::string(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;
 
-				std::string maskptr = it->mask.substr(2);
-
-				if (InspIRCd::Match(user->GetFullRealHost(), maskptr) || InspIRCd::Match(user->GetFullHost(), maskptr) || (InspIRCd::MatchCIDR(mask, maskptr)))
+				if (chan->CheckBan(user, it->mask.substr(2)))
 				{
 					// They match an entry on the list, so let them pass this.
-					return 1;
+					return MOD_RES_ALLOW;
 				}
 			}
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnCheckStringExtBan(const std::string &str, Channel *chan, char type)
+	ModResult OnCheckChannelBan(User* user, Channel* chan)
 	{
-		if (chan != NULL)
+		if (chan)
 		{
-			modelist *list;
-			chan->GetExt(be->GetInfoKey(), list);
-
-			if (!list)
-				return 0;
-			for (modelist::iterator it = list->begin(); it != list->end(); it++)
-			{
-				if (it->mask[0] != type || it->mask[1] != ':')
-					continue;
-
-				std::string maskptr = it->mask.substr(2);
-				if (InspIRCd::Match(str, maskptr))
-					return 1; // matches
-			}
-		}
-
-		return 0;
-	}
-
-	virtual int OnCheckBan(User* user, Channel* chan)
-	{
-		if (chan != NULL)
-		{
-			modelist* list;
-			chan->GetExt(be->GetInfoKey(), list);
+			modelist *list = be.extItem.get(chan);
 
 			if (!list)
 			{
 				// No list, proceed normally
-				return 0;
+				return MOD_RES_PASSTHRU;
 			}
 
-			std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
 			for (modelist::iterator it = list->begin(); it != list->end(); it++)
 			{
-				if (InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
+				if (chan->CheckBan(user, it->mask))
 				{
 					// They match an entry on the list, so let them in.
-					return 1;
+					return MOD_RES_ALLOW;
 				}
 			}
 		}
-		return 0;
-	}
-
-	virtual void OnCleanup(int target_type, void* item)
-	{
-		be->DoCleanup(target_type, item);
-	}
-
-	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
-	{
-		be->DoSyncChannel(chan, proto, opaque);
-	}
-
-	virtual void OnChannelDelete(Channel* chan)
-	{
-		be->DoChannelDelete(chan);
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnRehash(User* user, const std::string &param)
+	void OnCleanup(int target_type, void* item)
 	{
-		be->DoRehash();
+		be.DoCleanup(target_type, item);
 	}
 
-	virtual const char* OnRequest(Request* request)
+	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
-		ListModeRequest* LM = (ListModeRequest*)request;
-		if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
-		{
-			modelist* list;
-			LM->chan->GetExt(be->GetInfoKey(), list);
-			if (list)
-			{
-				std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
-				for (modelist::iterator it = list->begin(); it != list->end(); it++)
-				{
-					if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
-					{
-						// They match an entry
-						return (char*)it->mask.c_str();
-					}
-				}
-				return NULL;
-			}
-		}
-		return NULL;
+		be.DoSyncChannel(chan, proto, opaque);
 	}
 
-	virtual Version GetVersion()
+	void OnRehash(User* user)
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		be.DoRehash();
 	}
 
-	virtual ~ModuleBanException()
+	Version GetVersion()
 	{
-		ServerInstance->Modes->DelMode(be);
-		delete be;
-		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+		return Version("Provides support for the +e channel mode", VF_VENDOR);
 	}
 };