X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=ea7d781b5192c7ce4e5e93a58482823bb3def87a;hb=82243d9beb827fca5708efe9e047ff2fec4bfe8c;hp=5bd8d17e67cf409ca0231cd418a1b7aed2a31781;hpb=e51a4b5c29deac855496d6658a3c4612a61ffbb7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 5bd8d17e6..ea7d781b5 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,11 +1,25 @@
-#include <stdio.h>
+/*     +------------------------------------+
+ *     | Inspire Internet Relay Chat Daemon |
+ *     +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include <string>
 #include <vector>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "mode.h"
-#include "helperfuncs.h"
 #include "u_listmode.h"
 
 /* $ModDesc: Provides support for the +I channel mode */
@@ -17,27 +31,27 @@
  * The +I channel mode takes a nick!ident@host, glob patterns allowed,
  * and if a user matches an entry on the +I list then they can join the channel,
  * ignoring if +i is set on the channel
+ * Now supports CIDR and IP addresses -- Brain
  */
 
 class InspIRCd* ServerInstance;
 
+/** Handles channel mode +I
+ */
 class InviteException : public ListModeBase
 {
  public:
-	InviteException(Server* serv) : ListModeBase(serv, 'I', "End of Channel Invite Exception List", "346", "347", true) { }
+	InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", "346", "347", true) { }
 };
 
 class ModuleInviteException : public Module
 {
 	InviteException* ie;
-	Server* Srv;
-
 public:
-	ModuleInviteException(Server* serv) : Module(serv)
+	ModuleInviteException(InspIRCd* Me) : Module(Me)
 	{
-		ie = new InviteException(serv);
-		Srv = serv;
-		Srv->AddMode(ie, 'I');
+		ie = new InviteException(ServerInstance);
+		ServerInstance->AddMode(ie, 'I');
 	}
 	
 	virtual void Implements(char* List)
@@ -49,7 +63,6 @@ public:
 	virtual void On005Numeric(std::string &output)
 	{
 		output.append(" INVEX=I");
-		ServerInstance->ModeGrok->InsertMode(output, "I", 1);
 	}
 	 
 	virtual int OnCheckInvite(userrec* user, chanrec* chan)
@@ -60,9 +73,11 @@ public:
 			chan->GetExt(ie->GetInfoKey(), list);
 			if (list)
 			{
+				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(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
+					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;
@@ -97,7 +112,13 @@ public:
 		
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC);
+		return Version(1, 0, 0, 3, VF_VENDOR | VF_COMMON, API_VERSION);
+	}
+
+	~ModuleInviteException()
+	{
+		ServerInstance->Modes->DelMode(ie);
+		DELETE(ie);
 	}
 };
 
@@ -113,9 +134,9 @@ class ModuleInviteExceptionFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* serv)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleInviteException(serv);
+		return new ModuleInviteException(Me);
 	}
 	
 };