X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=b71992c053db8e226e2e8e8cbfa41334a57882aa;hb=9336468f5bfa60318cb57db5126047147b7a21cb;hp=1eb10e9c78dfc44f596d50df97618bd868006e35;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 1eb10e9c7..b71992c05 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -27,116 +27,83 @@
  * Now supports CIDR and IP addresses -- Brain
  */
 
-class InspIRCd* ServerInstance;
-
 /** Handles channel mode +I
  */
 class InviteException : public ListModeBase
 {
  public:
-	InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", "346", "347", true) { }
+	InviteException(Module* Creator) : ListModeBase(Creator, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
 };
 
 class ModuleInviteException : public Module
 {
-	InviteException* ie;
+	InviteException ie;
 public:
-	ModuleInviteException(InspIRCd* Me) : Module(Me)
+	ModuleInviteException() : ie(this)
 	{
-		ie = new InviteException(ServerInstance);
-		if (!ServerInstance->AddMode(ie))
+		if (!ServerInstance->Modes->AddMode(&ie))
 			throw ModuleException("Could not add new modes!");
 		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
-		ie->DoImplements(this);
+		ie.DoImplements(this);
 		Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
-	
-	virtual void On005Numeric(std::string &output)
+
+	void On005Numeric(std::string &output)
 	{
 		output.append(" INVEX=I");
 	}
-	 
-	virtual int OnCheckInvite(User* user, Channel* chan)
+
+	ModResult OnCheckInvite(User* user, Channel* chan)
 	{
 		if(chan != NULL)
 		{
-			modelist* list;
-			chan->GetExt(ie->GetInfoKey(), list);
+			modelist* list = ie.extItem.get(chan);
 			if (list)
 			{
-				char mask[MAXBUF];
-				snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
+				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.c_str()) || match(user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
+					if (chan->CheckBan(user, it->mask))
 					{
-						// They match an entry on the list, so let them in.
-						return 1;
+						return MOD_RES_ALLOW;
 					}
 				}
 			}
 			// 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 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(ie->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 ie.DoOnRequest(request);
 	}
 
-	virtual void OnCleanup(int target_type, void* item)
+	void OnCleanup(int target_type, void* item)
 	{
-		ie->DoCleanup(target_type, item);
+		ie.DoCleanup(target_type, item);
 	}
 
-	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
-		ie->DoSyncChannel(chan, proto, opaque);
+		ie.DoSyncChannel(chan, proto, opaque);
 	}
 
-	virtual void OnChannelDelete(Channel* chan)
+	void OnRehash(User* user)
 	{
-		ie->DoChannelDelete(chan);
+		ie.DoRehash();
 	}
 
-	virtual void OnRehash(User* user, const std::string &param)
-	{
-		ie->DoRehash();
-	}
-		
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version(1, 1, 0, 3, VF_VENDOR | VF_COMMON, API_VERSION);
+		return Version("Provides support for the +I channel mode", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
 
 	~ModuleInviteException()
 	{
-		ServerInstance->Modes->DelMode(ie);
-		delete ie;
 		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
 };