X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=2ad8ab87629c5be3b44f9b04398cc251e183d9de;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=bfae76f1b35899570b0b5c3df5b869735b1264e2;hpb=f1271614679843191bb247c0db2716acb5ac0e4b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index bfae76f1b..2ad8ab876 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.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.
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Sets (and unsets) modes on users when they connect */
 
@@ -23,41 +22,48 @@ class ModuleModesOnConnect : public Module
 	ConfigReader *Conf;
 
  public:
-	ModuleModesOnConnect(InspIRCd* Me)
-		: Module(Me)
-	{
-		
-		Conf = new ConfigReader(ServerInstance);
-		Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
+	ModuleModesOnConnect() 	{
+
+		Conf = new ConfigReader;
+		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);
 	}
 
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		delete Conf;
-		Conf = new ConfigReader(ServerInstance);
+		Conf = new ConfigReader;
 	}
-	
+
 	virtual ~ModuleModesOnConnect()
 	{
 		delete Conf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Sets (and unsets) modes on users when they connect", 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())
@@ -71,28 +77,26 @@ class ModuleModesOnConnect : public Module
 					while (ss >> buf)
 						tokens.push_back(buf);
 
-					int size = tokens.size() + 1;
-					const char** modes = new const char*[size];
-					modes[0] = user->nick;
-					modes[1] = tokens[0].c_str();
+					std::vector<std::string> modes;
+					modes.push_back(user->nick);
+					modes.push_back(tokens[0]);
 
 					if (tokens.size() > 1)
 					{
 						// process mode params
-						int i = 2;
 						for (unsigned int k = 1; k < tokens.size(); k++)
 						{
-							modes[i] = tokens[k].c_str();
-							i++;
+							modes.push_back(tokens[k]);
 						}
 					}
 
-					ServerInstance->Parser->CallHandler("MODE", modes, size, user);
-					delete [] modes;
+					ServerInstance->Parser->CallHandler("MODE", modes, user);
 				}
 				break;
 			}
 		}
+
+		memcpy(ServerInstance->Config->DisabledUModes, save, 64);
 	}
 };