X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=7e96c86d7c44e0970141746353f3986a01cc5918;hb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;hp=a2229a047445110aa96e2ebfd8ddb4938cd86267;hpb=2d821f2980825be73e3f90b47ffff365b0ec5ecb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index a2229a047..7e96c86d7 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,24 +2,16 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
 
@@ -27,15 +19,24 @@ class ModuleModesOnOper : public Module
 {
  private:
 
-	Server *Srv;
+	
 	ConfigReader *Conf;
 
  public:
-	ModuleModesOnOper(Server* Me)
-		: Module::Module(Me)
+	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)
 	{
-		Srv = Me;
-		Conf = new ConfigReader;
+		delete Conf;
+		Conf = new ConfigReader(ServerInstance);
 	}
 	
 	virtual ~ModuleModesOnOper()
@@ -45,56 +46,80 @@ class ModuleModesOnOper : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnOper(userrec* user, 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 typen = Conf->ReadValue("type","name",j);
-                        if (!strcmp(typen.c_str(),user->oper))
-                        {
-                                std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-				if (ThisOpersModes != "")
+		for (int j =0; j < Conf->Enumerate("type"); j++)
+		{
+			std::string typen = Conf->ReadValue("type","name",j);
+			if (typen == user->oper)
+			{
+				std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
+				if (!ThisOpersModes.empty())
 				{
-					char* modes[2];
-					modes[0] = user->nick;
-					modes[1] = (char*)ThisOpersModes.c_str();
-					Srv->SendMode(modes,2,user);
+					ApplyModes(user, ThisOpersModes);
 				}
-                                break;
-                        }
-                }
-	}
-};
+				break;
+			}
+		}
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleModesOnOperFactory : public ModuleFactory
-{
- public:
-	ModuleModesOnOperFactory()
-	{
-	}
-	
-	~ModuleModesOnOperFactory()
-	{
+		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;
+				}
+			}
+		}
 	}
-	
-	virtual Module * CreateModule(Server* 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;
+		stringstream ss(smodes);
+		vector<string> tokens;
 
-extern "C" void * init_module( void )
-{
-	return new ModuleModesOnOperFactory;
-}
+		// 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;
+		Event rmode((char *)&n, NULL, "send_mode_explicit");
+		for (unsigned int j = 0; j < tokens.size(); j++)
+			n.push_back(modes[j]);
+
+		rmode.Send(ServerInstance);
+		ServerInstance->SendMode(modes, size, u);
+		delete [] modes;
+	}
+};
 
+MODULE_INIT(ModuleModesOnOper)