X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=eaa472e1515c0a9f4968c3d75d181bd22d69fd1d;hb=553a8da754c8cd308bad2008018849714e70f9b7;hp=e77dd3976518458edb393c1e34361165a2b793b0;hpb=01c6d3a23b7dec047eab7d42db057bb211fb8b15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index e77dd3976..eaa472e15 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -1,99 +1,86 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Sets (and unsets) modes on users when they connect */
 
 class ModuleModesOnConnect : public Module
 {
- private:
-
-	ConfigReader *Conf;
-
  public:
-	ModuleModesOnConnect(InspIRCd* Me)
-		: Module(Me)
-	{
-
-		Conf = new ConfigReader(ServerInstance);
-		Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+	ModuleModesOnConnect() 	{
+		ServerInstance->Modules->Attach(I_OnUserConnect, this);
 	}
 
-
-	virtual void OnRehash(User* user, const std::string &parameter)
+	void Prioritize()
 	{
-		delete Conf;
-		Conf = new ConfigReader(ServerInstance);
+		// for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
+		ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
 	}
 
 	virtual ~ModuleModesOnConnect()
 	{
-		delete Conf;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
 	}
 
-	virtual void OnPostConnect(User* user)
+	virtual void OnUserConnect(LocalUser* 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++)
+		ConfigTag* tag = user->MyClass->config;
+		std::string ThisModes = tag->getString("modes");
+		if (!ThisModes.empty())
 		{
-			std::string hostn = Conf->ReadValue("connect","allow",j);
-			/* XXX: Fixme: does not respect port, limit, etc */
-			if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn)) || (InspIRCd::Match(user->host,hostn)))
-			{
-				std::string ThisModes = Conf->ReadValue("connect","modes",j);
-				if (!ThisModes.empty())
-				{
-					std::string buf;
-					std::stringstream ss(ThisModes);
-
-					std::vector<std::string> tokens;
+			std::string buf;
+			std::stringstream ss(ThisModes);
 
-					// split ThisUserModes into modes and mode params
-					while (ss >> buf)
-						tokens.push_back(buf);
+			std::vector<std::string> tokens;
 
-					std::vector<std::string> modes;
-					modes.push_back(user->nick);
-					modes.push_back(tokens[0]);
+			// split ThisUserModes into modes and mode params
+			while (ss >> buf)
+				tokens.push_back(buf);
 
-					if (tokens.size() > 1)
-					{
-						// process mode params
-						for (unsigned int k = 1; k < tokens.size(); k++)
-						{
-							modes.push_back(tokens[k]);
-						}
-					}
+			std::vector<std::string> modes;
+			modes.push_back(user->nick);
+			modes.push_back(tokens[0]);
 
-					ServerInstance->Parser->CallHandler("MODE", modes, user);
+			if (tokens.size() > 1)
+			{
+				// process mode params
+				for (unsigned int k = 1; k < tokens.size(); k++)
+				{
+					modes.push_back(tokens[k]);
 				}
-				break;
 			}
+
+			ServerInstance->Parser->CallHandler("MODE", modes, user);
 		}
 
 		memcpy(ServerInstance->Config->DisabledUModes, save, 64);