X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=1efefe75344d01ac675e63162380d277c0c90e0a;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=4f1f0745918060ab3507d2bf8534a30ac11202ad;hpb=4b0f6c610f755e0cb93843d5a2a6c70336eafe39;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 4f1f07459..1efefe753 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,26 +2,16 @@
  *       | Inspire 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.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#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 */
 
@@ -29,39 +19,37 @@ class ModuleModesOnOper : public Module
 {
  private:
 
-	
+
 	ConfigReader *Conf;
 
  public:
 	ModuleModesOnOper(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
-		
+
 		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);
+		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
-	
+
 	virtual ~ModuleModesOnOper()
 	{
-		DELETE(Conf);
+		delete Conf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
-	
-	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
@@ -69,72 +57,60 @@ class ModuleModesOnOper : public Module
 		for (int j =0; j < Conf->Enumerate("type"); j++)
 		{
 			std::string typen = Conf->ReadValue("type","name",j);
-			if (!strcmp(typen.c_str(),user->oper))
+			if (typen == user->oper)
 			{
 				std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-				char first = *(ThisOpersModes.c_str());
-				if ((first != '+') && (first != '-'))
-					ThisOpersModes = "+" + ThisOpersModes;
-				if (ThisOpersModes != "")
+				if (!ThisOpersModes.empty())
 				{
-					std::string buf;
-					stringstream ss(ThisOpersModes);
-
-					vector<string> tokens;
-
-					// split ThisOperModes into modes and mode params
-					while (ss >> buf)
-						tokens.push_back(buf);
-
-					int size = tokens.size() + 1;
-					const char* modes[size];
-					modes[0] = user->nick;
-					modes[1] = (char*)tokens[0].c_str();
+					ApplyModes(user, ThisOpersModes);
+				}
+				break;
+			}
+		}
 
-					if (tokens.size() > 1)
+		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())
 					{
-						// 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++;
-						}
+						ApplyModes(user, ThisOpersModes);
 					}
-					
-					ServerInstance->Log(DEBUG, "m_opermodes.so: new modes for %s: %s", modes[0], modes[1]);
-					ServerInstance->SendMode(modes, size, user);
+					break;
 				}
-				break;
 			}
 		}
 	}
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleModesOnOperFactory : public ModuleFactory
-{
- public:
-	ModuleModesOnOperFactory()
+	void ApplyModes(User *u, std::string &smodes)
 	{
-	}
-	
-	~ModuleModesOnOperFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		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> tokens;
 
-extern "C" void * init_module( void )
-{
-	return new ModuleModesOnOperFactory;
-}
+		// 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]);
+		}
+
+		ServerInstance->SendMode(modes, u);
+		ServerInstance->PI->SendMode(u->uuid, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
+	}
+};
 
+MODULE_INIT(ModuleModesOnOper)