X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=4d4fcd998b7c42677e20b8c3fad851bfa4c8613b;hb=3624c137a6db85eaab0372550c9dca79d6d21e55;hp=b354abf0afe9ae2ae1a60ffd0593d8e4523af502;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index b354abf0a..4d4fcd998 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -1,115 +1,74 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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 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/>.
  */
 
-using namespace std;
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
 #include "inspircd.h"
-#include "modules.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
 
 class ModuleModesOnOper : public Module
 {
- private:
-
-	
-	ConfigReader *Conf;
-
  public:
-	ModuleModesOnOper(InspIRCd* Me)
-		: Module::Module(Me)
+	void init() CXX11_OVERRIDE
 	{
-		
-		Conf = new ConfigReader;
+		ServerInstance->Modules->Attach(I_OnPostOper, this);
 	}
 
-	void Implements(char* List)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		List[I_OnPostOper] = List[I_OnRehash] = 1;
+		return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
 	}
 
-	virtual void OnRehash(const std::string &parameter)
-	{
-		DELETE(Conf);
-		Conf = new ConfigReader;
-	}
-	
-	virtual ~ModuleModesOnOper()
-	{
-		DELETE(Conf);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,1,VF_VENDOR);
-	}
-	
-	virtual void OnPostOper(userrec* user, const std::string &opertype)
+	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.
-		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 (!strcmp(typen.c_str(),user->oper))
-			{
-				std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-				char first = *(ThisOpersModes.c_str());
-				if ((first != '+') && (first != '-'))
-					ThisOpersModes = "+" + ThisOpersModes;
-				if (ThisOpersModes != "")
-				{
-					const char* modes[2];
-					modes[0] = user->nick;
-					modes[1] = ThisOpersModes.c_str();
-					ServerInstance->SendMode(modes,2,user);
-				}
-				break;
-			}
+			ApplyModes(user, ThisOpersModes);
 		}
 	}
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleModesOnOperFactory : public ModuleFactory
-{
- public:
-	ModuleModesOnOperFactory()
-	{
-	}
-	
-	~ModuleModesOnOperFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+	void ApplyModes(User *u, std::string &smodes)
 	{
-		return new ModuleModesOnOper(Me);
-	}
-	
-};
+		char first = *(smodes.c_str());
+		if ((first != '+') && (first != '-'))
+			smodes = "+" + smodes;
 
+		std::string buf;
+		std::stringstream ss(smodes);
+		std::vector<std::string> modes;
 
-extern "C" void * init_module( void )
-{
-	return new ModuleModesOnOperFactory;
-}
+		modes.push_back(u->nick);
+		// split into modes and mode params
+		while (ss >> buf)
+			modes.push_back(buf);
+
+		ServerInstance->Modes->Process(modes, u);
+	}
+};
 
+MODULE_INIT(ModuleModesOnOper)