X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=acac7640adf0149ce1ecf4117e83d387469ee671;hb=c46f8a368c42f64284244f3d2dfc022a383294fa;hp=eaa472e1515c0a9f4968c3d75d181bd22d69fd1d;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index eaa472e15..acac7640a 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -22,37 +22,25 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Sets (and unsets) modes on users when they connect */
-
 class ModuleModesOnConnect : public Module
 {
  public:
-	ModuleModesOnConnect() 	{
-		ServerInstance->Modules->Attach(I_OnUserConnect, this);
-	}
-
-	void Prioritize()
+	void Prioritize() CXX11_OVERRIDE
 	{
 		// 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];
-		memcpy(save, ServerInstance->Config->DisabledUModes,
-				sizeof(ServerInstance->Config->DisabledUModes));
-		memset(ServerInstance->Config->DisabledUModes, 0, 64);
+		const std::bitset<64> save = ServerInstance->Config->DisabledUModes;
+		ServerInstance->Config->DisabledUModes.reset();
 
 		ConfigTag* tag = user->MyClass->config;
 		std::string ThisModes = tag->getString("modes");
@@ -61,29 +49,17 @@ 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);
+		ServerInstance->Config->DisabledUModes = save;
 	}
 };