X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=8b49f685e73b5eef372a5f11ce031a240a57f24a;hb=ccd4c11ea1a43d079eaae9708482ef4a9148796c;hp=877b9b441fa7da06769f17d79470ea53714bbeec;hpb=59ca4eec57a9c8b37e79e3031c74b59d4803fc28;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 877b9b441..8b49f685e 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -1,87 +1,58 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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 */
 
 class ModuleModesOnOper : public Module
 {
- private:
-
-	
-	ConfigReader *Conf;
-
  public:
-	ModuleModesOnOper(InspIRCd* Me)
-		: Module(Me)
+	void init()
 	{
-		
-		Conf = new ConfigReader(ServerInstance);
-		Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(I_OnPostOper, this);
 	}
 
-
-	virtual void OnRehash(User* user, const std::string &parameter)
-	{
-		delete Conf;
-		Conf = new ConfigReader(ServerInstance);
-	}
-	
 	virtual ~ModuleModesOnOper()
 	{
-		delete Conf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+		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)
 	{
+		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.
-		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,31 +64,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);
-
-		int size = tokens.size() + 1;
-		const char** modes = new const char*[size];
-		modes[0] = u->nick;
-
-		// process mode params
-		int i = 1;
-		for (unsigned int k = 0; k < tokens.size(); k++)
-		{
-			modes[i] = tokens[k].c_str();
-			i++;
-		}
-
-		std::deque<std::string> n;
-		for (unsigned int j = 1; j < tokens.size(); j++)
-			n.push_back(modes[j]);
+			modes.push_back(buf);
 
-		ServerInstance->PI->SendMode(u->uuid, n);
-		ServerInstance->SendMode(modes, size, u);
-		delete [] modes;
+		ServerInstance->SendMode(modes, u);
 	}
 };