X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=30f6fef9cbefdc24d59bf33556e27645818d999d;hb=9cf56d917d92959701694477f7944d45ad2c38ed;hp=c7ca62a69e766584841c830e7cffb93d19ed0c8c;hpb=3ba6fa6d7f81cc1c20a3ad4a7d2aa9521e9b36a8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index c7ca62a69..30f6fef9c 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,23 +2,20 @@
  *       | 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-2007 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 <vector>
 #include "users.h"
 #include "channels.h"
+#include "inspircd.h"
 #include "modules.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
@@ -27,15 +24,15 @@ class ModuleModesOnOper : public Module
 {
  private:
 
-	Server *Srv;
+	
 	ConfigReader *Conf;
 
  public:
-	ModuleModesOnOper(Server* Me)
-		: Module::Module(Me)
+	ModuleModesOnOper(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = Me;
-		Conf = new ConfigReader;
+		
+		Conf = new ConfigReader(ServerInstance);
 	}
 
 	void Implements(char* List)
@@ -43,46 +40,75 @@ class ModuleModesOnOper : public Module
 		List[I_OnPostOper] = List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(std::string parameter)
+	virtual void OnRehash(userrec* user, const std::string &parameter)
 	{
-		delete Conf;
-		Conf = new ConfigReader;
+		DELETE(Conf);
+		Conf = new ConfigReader(ServerInstance);
 	}
 	
 	virtual ~ModuleModesOnOper()
 	{
-		delete Conf;
+		DELETE(Conf);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnPostOper(userrec* user, std::string opertype)
+	virtual void OnPostOper(userrec* user, const std::string &opertype)
 	{
 		// 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);
+		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);
 				char first = *(ThisOpersModes.c_str());
 				if ((first != '+') && (first != '-'))
 					ThisOpersModes = "+" + ThisOpersModes;
 				if (ThisOpersModes != "")
 				{
-					char* modes[2];
+					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;
+					char** modes = new char*[size];
 					modes[0] = user->nick;
-					modes[1] = (char*)ThisOpersModes.c_str();
-					Srv->SendMode(modes,2,user);
+					modes[1] = (char*)tokens[0].c_str();
+
+					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();
+							i++;
+						}
+					}
+					std::deque<std::string> n;
+					Event rmode((char *)&n, NULL, "send_mode");
+					for (unsigned int j = 0; j < tokens.size(); j++)
+					{
+						n.push_back(modes[j]);
+					}
+					rmode.Send(ServerInstance);
+					ServerInstance->SendMode((const char**)modes, size, user);
+					delete [] modes;
 				}
-                                break;
-                        }
-                }
+				break;
+			}
+		}
 	}
 };
 
@@ -99,7 +125,7 @@ class ModuleModesOnOperFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleModesOnOper(Me);
 	}
@@ -107,7 +133,7 @@ class ModuleModesOnOperFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleModesOnOperFactory;
 }