X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=7ab54cedf15c014992be7b9c07ce05fbbc6a8e2f;hb=b14ebbccf08ec34a73e1ba271e67da80d9fe805c;hp=33c8c54b04b910bee659c61dac29a6c8b765601b;hpb=f09f2e193039d64795f0c2fac6114dc109bd40ab;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 33c8c54b0..7ab54cedf 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -1,87 +1,47 @@
-/*       +------------------------------------+
- *       | 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
 {
- 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)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		delete Conf;
-		Conf = new ConfigReader(ServerInstance);
+		return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
 	}
 
-	virtual ~ModuleModesOnOper()
+	void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
 	{
-		delete Conf;
-	}
+		if (!IS_LOCAL(user))
+			return;
 
-	virtual Version GetVersion()
-	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
-	}
-
-	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);
 		}
 	}
 
@@ -93,23 +53,14 @@ class ModuleModesOnOper : public Module
 
 		std::string buf;
 		std::stringstream ss(smodes);
-		std::vector<std::string> tokens;
+		std::vector<std::string> modes;
 
+		modes.push_back(u->nick);
 		// split into modes and mode params
 		while (ss >> buf)
-			tokens.push_back(buf);
-
-		std::vector<std::string> modes;
-		modes.push_back(u->nick);
-
-		// process mode params
-		for (unsigned int k = 0; k < tokens.size(); k++)
-		{
-			modes.push_back(tokens[k]);
-		}
+			modes.push_back(buf);
 
-		ServerInstance->SendMode(modes, u);
-		ServerInstance->PI->SendMode(u->uuid, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
+		ServerInstance->Modes->Process(modes, u);
 	}
 };