X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=5cd2674a3d6e15b28e458efc1f0f5ab7456eaa55;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=a0e762dbf7dc4ba83bd2230a064d4d7f0b03e572;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index a0e762dbf..5cd2674a3 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,125 +11,70 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <vector>
-#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)
+	ModuleModesOnOper()
 	{
-		
-		Conf = new ConfigReader(ServerInstance);
+		Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnPostOper] = List[I_OnRehash] = 1;
-	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
-		DELETE(Conf);
-		Conf = new ConfigReader(ServerInstance);
 	}
-	
+
 	virtual ~ModuleModesOnOper()
 	{
-		DELETE(Conf);
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
 	}
-	
-	virtual void OnPostOper(userrec* user, const std::string &opertype)
+
+	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 (!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 != "")
-				{
-					std::string buf;
-					stringstream ss(ThisOpersModes);
+			ApplyModes(user, ThisOpersModes);
+		}
+	}
 
-					vector<string> tokens;
+	void ApplyModes(User *u, std::string &smodes)
+	{
+		char first = *(smodes.c_str());
+		if ((first != '+') && (first != '-'))
+			smodes = "+" + smodes;
 
-					// split ThisOperModes into modes and mode params
-					while (ss >> buf)
-						tokens.push_back(buf);
+		std::string buf;
+		std::stringstream ss(smodes);
+		std::vector<std::string> tokens;
 
-					int size = tokens.size() + 1;
-					const char* modes[size];
-					modes[0] = user->nick;
-					modes[1] = (char*)tokens[0].c_str();
+		// split into modes and mode params
+		while (ss >> buf)
+			tokens.push_back(buf);
 
-					if (tokens.size() > 1)
-					{
-						// process mode params
-						int i = 2;
-						for (unsigned int k = 1; k < tokens.size(); k++)
-						{
-							modes[i] = (char*)tokens[k].c_str();
-							ServerInstance->Log(DEBUG, "m_opermodes.so: got mode param: %s", modes[i]);
-							i++;
-						}
-					}
-					
-					ServerInstance->Log(DEBUG, "m_opermodes.so: new modes for %s: %s", modes[0], modes[1]);
-					ServerInstance->SendMode(modes, size, user);
-				}
-				break;
-			}
-		}
-	}
-};
+		std::vector<std::string> modes;
+		modes.push_back(u->nick);
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
+		// process mode params
+		for (unsigned int k = 0; k < tokens.size(); k++)
+		{
+			modes.push_back(tokens[k]);
+		}
 
-class ModuleModesOnOperFactory : public ModuleFactory
-{
- public:
-	ModuleModesOnOperFactory()
-	{
-	}
-	
-	~ModuleModesOnOperFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleModesOnOper(Me);
+		ServerInstance->SendGlobalMode(modes, u);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleModesOnOperFactory;
-}
-
+MODULE_INIT(ModuleModesOnOper)