X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=7a8d66ae72dcd24812612e01499c3db1efe6fab6;hb=bd1471bc08be28bc2554d35fdaeb078338b14266;hp=a21462ddf39a79b33dc91e537f43ee2cd802d8c0;hpb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index a21462ddf..7a8d66ae7 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -22,32 +22,21 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Sets (and unsets) modes on users when they connect */
-
 class ModuleModesOnConnect : public Module
 {
  public:
-	void init()
-	{
-		ServerInstance->Modules->Attach(I_OnUserConnect, this);
-	}
-
 	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);
 	}
 
-	virtual ~ModuleModesOnConnect()
-	{
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
 	}
 
-	virtual void OnUserConnect(LocalUser* user)
+	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
 	{
 		// Backup and zero out the disabled usermodes, so that we can override them here.
 		char save[64];
@@ -62,26 +51,14 @@ class ModuleModesOnConnect : public Module
 			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]);
-				}
-			}
+			// split ThisUserModes into modes and mode params
+			while (ss >> buf)
+				modes.push_back(buf);
 
-			ServerInstance->Parser->CallHandler("MODE", modes, user);
+			ServerInstance->Parser.CallHandler("MODE", modes, user);
 		}
 
 		memcpy(ServerInstance->Config->DisabledUModes, save, 64);