X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=2f93ec5f1731efd953a0522bd5d503ba8c8020da;hb=HEAD;hp=f72f007c4b783b7f2acf315636b329be95995716;hpb=96a4a1d41e42dba806c2e9954e148ed838262511;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index f72f007c4..2f93ec5f1 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -1,87 +1,51 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2010 Craig Edwards <brain@inspircd.org>
  *
- * 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
 {
- private:
-
-
-	ConfigReader *Conf;
-
  public:
-	ModuleModesOnOper(InspIRCd* Me)
-		: Module(Me)
-	{
-
-		Conf = new ConfigReader(ServerInstance);
-		Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-	}
-
-
-	virtual void OnRehash(User* user, const std::string &parameter)
-	{
-		delete Conf;
-		Conf = new ConfigReader(ServerInstance);
-	}
-
-	virtual ~ModuleModesOnOper()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		delete Conf;
+		return Version("Allows the server administrator to set user modes on server operators when they log into their server operator account.", VF_VENDOR);
 	}
 
-	virtual Version GetVersion()
+	void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
-	}
+		if (!IS_LOCAL(user))
+			return;
 
-	virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
-	{
 		// 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.
-		for (int j =0; j < Conf->Enumerate("type"); j++)
+		std::string ThisOpersModes = user->oper->getConfig("modes");
+		if (!ThisOpersModes.empty())
 		{
-			std::string typen = Conf->ReadValue("type","name",j);
-			if (typen == user->oper)
-			{
-				std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-				if (!ThisOpersModes.empty())
-				{
-					ApplyModes(user, ThisOpersModes);
-				}
-				break;
-			}
-		}
-
-		if (!opername.empty()) // if user is local ..
-		{
-			for (int j = 0; j < Conf->Enumerate("oper"); j++)
-			{
-				if (opername == Conf->ReadValue("oper", "name", j))
-				{
-					std::string ThisOpersModes = Conf->ReadValue("oper", "modes", j);
-					if (!ThisOpersModes.empty())
-					{
-						ApplyModes(user, ThisOpersModes);
-					}
-					break;
-				}
-			}
+			ApplyModes(user, ThisOpersModes);
 		}
 	}
 
@@ -92,32 +56,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]);
-		}
-
-		std::deque<std::string> n;
-		std::deque<TranslateType> t;
-		for (unsigned int j = 1; j < tokens.size(); j++)
-		{
-			n.push_back(modes[j]);
-			t.push_back(TR_TEXT);
-		}
-
-		ServerInstance->PI->SendMode(u->uuid, n, t);
-		ServerInstance->SendMode(modes, u);
+		ServerInstance->Parser.CallHandler("MODE", modes, u);
 	}
 };