X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=8cf6d1651459b6274b54de376e06482d8e6068b0;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=7a8d66ae72dcd24812612e01499c3db1efe6fab6;hpb=5267fb9d362aeb326c9e64f7171c957f76776f90;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 7a8d66ae7..8cf6d1651 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -1,10 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   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) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -25,43 +26,25 @@
 class ModuleModesOnConnect : public Module
 {
  public:
-	void Prioritize()
-	{
-		// 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);
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
+		return Version("Allows the server administrator to set user modes on connecting users.", VF_VENDOR);
 	}
 
 	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
 	{
-		// 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);
-
-		ConfigTag* tag = user->MyClass->config;
-		std::string ThisModes = tag->getString("modes");
-		if (!ThisModes.empty())
-		{
-			std::string buf;
-			std::stringstream ss(ThisModes);
-
-			std::vector<std::string> modes;
-			modes.push_back(user->nick);
+		const std::string modestr = user->MyClass->config->getString("modes");
+		if (modestr.empty())
+			return;
 
-			// split ThisUserModes into modes and mode params
-			while (ss >> buf)
-				modes.push_back(buf);
+		CommandBase::Params params;
+		params.push_back(user->nick);
 
-			ServerInstance->Parser.CallHandler("MODE", modes, user);
-		}
+		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);
 	}
 };