X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=475d561ba2028a1f2de837699b5680220111aff7;hb=9ed9396278c2499f5322575c87aa4daea33992e3;hp=d029fda64e8de92b3ed2e43c53e7b3d483c02b81;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index d029fda64..475d561ba 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -22,33 +22,19 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Sets (and unsets) modes on opers when they oper up */
-
 class ModuleModesOnOper : public Module
 {
  public:
-	ModuleModesOnOper()
-	{
-		Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-	}
-
-
-	virtual void OnRehash(User* user)
-	{
-	}
-
-	virtual ~ModuleModesOnOper()
-	{
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
 	}
 
-	virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
+	void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
 	{
+		if (!IS_LOCAL(user))
+			return;
+
 		// whenever a user opers, go through the oper types, find their <type:modes>,
 		// and if they have one apply their modes. The mode string can contain +modes
 		// to add modes to the user or -modes to take modes from the user.
@@ -66,23 +52,15 @@ class ModuleModesOnOper : public Module
 			smodes = "+" + smodes;
 
 		std::string buf;
-		std::stringstream ss(smodes);
-		std::vector<std::string> tokens;
-
-		// split into modes and mode params
-		while (ss >> buf)
-			tokens.push_back(buf);
+		irc::spacesepstream ss(smodes);
+		CommandBase::Params modes;
 
-		std::vector<std::string> modes;
 		modes.push_back(u->nick);
+		// split into modes and mode params
+		while (ss.GetToken(buf))
+			modes.push_back(buf);
 
-		// process mode params
-		for (unsigned int k = 0; k < tokens.size(); k++)
-		{
-			modes.push_back(tokens[k]);
-		}
-
-		ServerInstance->SendGlobalMode(modes, u);
+		ServerInstance->Parser.CallHandler("MODE", modes, u);
 	}
 };