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

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 2ad8ab876..8cf6d1651 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -1,102 +1,50 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2013, 2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
- * 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 */
+#include "inspircd.h"
 
 class ModuleModesOnConnect : public Module
 {
- private:
-
-	ConfigReader *Conf;
-
  public:
-	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)
-	{
-		delete Conf;
-		Conf = new ConfigReader;
-	}
-
-	virtual ~ModuleModesOnConnect()
-	{
-		delete Conf;
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR,API_VERSION);
+		return Version("Allows the server administrator to set user modes on connecting users.", VF_VENDOR);
 	}
 
-	virtual void OnUserConnect(User* user)
+	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
 	{
-		if (!IS_LOCAL(user))
+		const std::string modestr = user->MyClass->config->getString("modes");
+		if (modestr.empty())
 			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);
-			/* 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())
-				{
-					std::string buf;
-					std::stringstream ss(ThisModes);
-
-					std::vector<std::string> tokens;
-
-					// split ThisUserModes into modes and mode params
-					while (ss >> buf)
-						tokens.push_back(buf);
-
-					std::vector<std::string> modes;
-					modes.push_back(user->nick);
-					modes.push_back(tokens[0]);
-
-					if (tokens.size() > 1)
-					{
-						// process mode params
-						for (unsigned int k = 1; k < tokens.size(); k++)
-						{
-							modes.push_back(tokens[k]);
-						}
-					}
+		CommandBase::Params params;
+		params.push_back(user->nick);
 
-					ServerInstance->Parser->CallHandler("MODE", modes, user);
-				}
-				break;
-			}
-		}
+		irc::spacesepstream modestream(modestr);
+		for (std::string modetoken; modestream.GetToken(modetoken); )
+			params.push_back(modetoken);
 
-		memcpy(ServerInstance->Config->DisabledUModes, save, 64);
+		ServerInstance->Parser.CallHandler("MODE", params, user);
 	}
 };