X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=e22ada43ded2bd23b8d5eeebcbc3804039173593;hb=bb7d85d51e2d51ac13f335b13dfa1f8e8ba3e23b;hp=152415a9170c0079929571102b9cc57cf77a5af5;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 152415a91..e22ada43d 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -32,60 +32,110 @@
 class BanException : public ListModeBase
 {
  public:
-	BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", "348", "349", true) { }
+	BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", 348, 349, true) { }
 };
 
 
 class ModuleBanException : public Module
 {
 	BanException* be;
-	
+
 
 public:
-	ModuleBanException(InspIRCd* Me)
-	: Module(Me)
+	ModuleBanException(InspIRCd* Me) : Module(Me)
 	{
 		be = new BanException(ServerInstance);
-		if (!ServerInstance->AddMode(be, 'e'))
+		if (!ServerInstance->Modes->AddMode(be))
 			throw ModuleException("Could not add new modes!");
-		ServerInstance->PublishInterface("ChannelBanList", this);
-	}
-	
-	virtual void Implements(char* List)
-	{
-		be->DoImplements(List);
-		List[I_OnRehash] = List[I_OnRequest] = List[I_On005Numeric] = List[I_OnCheckBan] = 1;
+		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);
+
 	}
-	
+
 	virtual void On005Numeric(std::string &output)
 	{
 		output.append(" EXCEPTS=e");
 	}
 
-	virtual int OnCheckBan(userrec* user, chanrec* chan)
+	virtual int OnCheckExtBan(User *user, Channel *chan, char type)
 	{
 		if (chan != NULL)
 		{
-			modelist* list;
+			modelist *list;
 			chan->GetExt(be->GetInfoKey(), list);
-			
-			if (list)
+
+			if (!list)
+				return 0;
+
+			std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
+			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;
+
+				std::string maskptr = it->mask.substr(2);
+
+				if (match(user->GetFullRealHost(), maskptr) || match(user->GetFullHost(), maskptr) || (match(mask, maskptr, true)))
 				{
-					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 1;
 				}
+			}
+		}
+
+		return 0;
+	}
+
+	virtual int OnCheckStringExtBan(const std::string &str, Channel *chan, char type)
+	{
+		if (chan != NULL)
+		{
+			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 (match(maskptr, str))
+					return 1; // matches
 			}
-			// 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 0;
+	}
+
+	virtual int OnCheckBan(User* user, Channel* chan)
+	{
+		if (chan != NULL)
+		{
+			modelist* list;
+			chan->GetExt(be->GetInfoKey(), list);
+
+			if (!list)
+			{
+				// No list, proceed normally
+				return 0;
+			}
+
+			std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
+			for (modelist::iterator it = list->begin(); it != list->end(); it++)
+			{
+				if (match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (match(mask, it->mask, true)))
+				{
+					// They match an entry on the list, so let them in.
+					return 1;
+				}
+			}
+		}
+		return 0;
 	}
 
 	virtual void OnCleanup(int target_type, void* item)
@@ -93,22 +143,22 @@ public:
 		be->DoCleanup(target_type, item);
 	}
 
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		be->DoSyncChannel(chan, proto, opaque);
 	}
 
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		be->DoChannelDelete(chan);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		be->DoRehash();
 	}
 
-	virtual char* OnRequest(Request* request)
+	virtual const char* OnRequest(Request* request)
 	{
 		ListModeRequest* LM = (ListModeRequest*)request;
 		if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
@@ -117,11 +167,10 @@ public:
 			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());
+				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 (match(LM->user->GetFullRealHost(), it->mask.c_str()) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
+					if (match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask) || (match(mask, it->mask, true)))
 					{
 						// They match an entry
 						return (char*)it->mask.c_str();
@@ -135,14 +184,14 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 	virtual ~ModuleBanException()
 	{
 		ServerInstance->Modes->DelMode(be);
-		DELETE(be);
-		ServerInstance->UnpublishInterface("ChannelBanList", this);
+		delete be;
+		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
 };