X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=2e6f6db6533f98ea5cc7384ee73c5612f87e3448;hb=cb4c516ace8fef75b8a54a141c3644af9697ac0a;hp=130ca9a430990c05b3ab63c0f8a4b8ac86ab5581;hpb=0da6b3a13def40e8fd002b9fc60f955467f6372d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 130ca9a43..2e6f6db65 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -27,96 +27,78 @@
  * 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, "invex", '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->Modes->AddMode(ie))
+		if (!ServerInstance->Modes->AddMode(&ie))
 			throw ModuleException("Could not add new modes!");
-		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
-		ie->DoImplements(this);
-		Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
+		ie.DoImplements(this);
+		Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite, I_OnCheckKey };
 		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)
 			{
-				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;
 					}
 				}
 			}
-			// 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 const char* OnRequest(Request* request)
-	{
-		return ie->DoOnRequest(request);
-	}
-
-	virtual void OnCleanup(int target_type, void* item)
-	{
-		ie->DoCleanup(target_type, item);
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+	ModResult OnCheckKey(User* user, Channel* chan, const std::string& key)
 	{
-		ie->DoSyncChannel(chan, proto, opaque);
+		if (ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true))
+			return OnCheckInvite(user, chan);
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnChannelDelete(Channel* chan)
+	void OnCleanup(int target_type, void* item)
 	{
-		ie->DoChannelDelete(chan);
+		ie.DoCleanup(target_type, item);
 	}
 
-	virtual void OnRehash(User* user)
+	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
-		ie->DoRehash();
+		ie.DoSyncChannel(chan, proto, opaque);
 	}
 
-	virtual Version GetVersion()
+	void OnRehash(User* user)
 	{
-		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+		ie.DoRehash();
 	}
 
-	~ModuleInviteException()
+	Version GetVersion()
 	{
-		ServerInstance->Modes->DelMode(ie);
-		delete ie;
-		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+		return Version("Provides support for the +I channel mode", VF_VENDOR);
 	}
 };