X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=42c0ec660d4022f3c2ead5ec523c8e66db59da00;hb=58ecf39129ae6d1e5a15785c7bb8bf0fd5ee46b9;hp=2970b724104c15d19d1db3f963c4063c3be143dc;hpb=12b9855339a3bbd05cc0636588ea68bf8db390f5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 2970b7241..42c0ec660 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-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -26,77 +26,77 @@ class ModuleModesOnConnect : public Module
 	ModuleModesOnConnect(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		Conf = new ConfigReader(ServerInstance);
 		Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnPostConnect] = List[I_OnRehash] = 1;
-	}
 
 	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
-	
+
 	virtual ~ModuleModesOnConnect()
 	{
 		delete Conf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
-	
+
 	virtual void OnPostConnect(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, 64);
+		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 ((match(user->GetIPString(),hostn,true)) || (match(user->host,hostn)))
 			{
 				std::string ThisModes = Conf->ReadValue("connect","modes",j);
 				if (!ThisModes.empty())
 				{
 					std::string buf;
-					stringstream ss(ThisModes);
+					std::stringstream ss(ThisModes);
 
-					vector<string> tokens;
+					std::vector<std::string> tokens;
 
 					// split ThisUserModes into modes and mode params
 					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);
 	}
 };