X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=c091691c6705a23569159d2ae27d265f602b15bf;hb=eacd707421be4f2612df9bde4517649061bb062e;hp=97a8b83406ad93500c0a539cdbbf6313d482a408;hpb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 97a8b8340..c091691c6 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Sets (and unsets) modes on users when they connect */
 
@@ -23,13 +22,14 @@ class ModuleModesOnConnect : public Module
 	ConfigReader *Conf;
 
  public:
-	ModuleModesOnConnect(InspIRCd* Me)
-		: Module(Me)
+	ModuleModesOnConnect(InspIRCd* Me) : Module(Me)
 	{
-		
+
 		Conf = new ConfigReader(ServerInstance);
-		Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
+		Implementation eventlist[] = { I_OnUserConnect, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
+		// for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
+		ServerInstance->Modules->SetPriority(this, PRIORITY_FIRST);
 	}
 
 
@@ -38,26 +38,33 @@ class ModuleModesOnConnect : public Module
 		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
-	
+
 	virtual ~ModuleModesOnConnect()
 	{
 		delete Conf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_VENDOR,API_VERSION);
 	}
-	
-	virtual void OnPostConnect(User* user)
+
+	virtual void OnUserConnect(User* user)
 	{
 		if (!IS_LOCAL(user))
 			return;
 
+		// Backup and zero out the disabled usermodes, so that we can override them here.
+		char save[64];
+		memcpy(save, ServerInstance->Config->DisabledUModes,
+				sizeof(ServerInstance->Config->DisabledUModes));
+		memset(ServerInstance->Config->DisabledUModes, 0, 64);
+
 		for (int j = 0; j < Conf->Enumerate("connect"); j++)
 		{
 			std::string hostn = Conf->ReadValue("connect","allow",j);
-			if ((match(user->GetIPString(),hostn.c_str(),true)) || (match(user->host,hostn.c_str())))
+			/* XXX: Fixme: does not respect port, limit, etc */
+			if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn, ascii_case_insensitive_map)) || (InspIRCd::Match(user->host,hostn, ascii_case_insensitive_map)))
 			{
 				std::string ThisModes = Conf->ReadValue("connect","modes",j);
 				if (!ThisModes.empty())
@@ -89,6 +96,8 @@ class ModuleModesOnConnect : public Module
 				break;
 			}
 		}
+
+		memcpy(ServerInstance->Config->DisabledUModes, save, 64);
 	}
 };