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

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 94a9eefe9..475d561ba 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -1,45 +1,40 @@
-/*       +------------------------------------+
- *       | 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) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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 opers when they oper up */
+#include "inspircd.h"
 
 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.
@@ -48,12 +43,6 @@ class ModuleModesOnOper : public Module
 		{
 			ApplyModes(user, ThisOpersModes);
 		}
-
-		ThisOpersModes = user->oper->getConfig("modes");
-		if (!ThisOpersModes.empty())
-		{
-			ApplyModes(user, ThisOpersModes);
-		}
 	}
 
 	void ApplyModes(User *u, std::string &smodes)
@@ -63,24 +52,15 @@ class ModuleModesOnOper : public Module
 			smodes = "+" + smodes;
 
 		std::string buf;
-		std::stringstream ss(smodes);
-		std::vector<std::string> tokens;
+		irc::spacesepstream ss(smodes);
+		CommandBase::Params modes;
 
-		// split into modes and mode params
-		while (ss >> buf)
-			tokens.push_back(buf);
-
-		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->SendMode(modes, u);
-		ServerInstance->PI->SendMode(u->uuid, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
+		ServerInstance->Parser.CallHandler("MODE", modes, u);
 	}
 };