X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=fea793c0416b66f24bb6c44e4529b1366adb63a4;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=6bf823d319eaccd91389c67c57ce70bc6b2094f4;hpb=a7b0c26a4c56440e4bc5ddc6d3ecfeb36089dbb2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 6bf823d31..fea793c04 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,24 +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-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 "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,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,20 +35,20 @@ class ModuleModesOnOper : public Module
 		List[I_OnPostOper] = List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(const 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, const std::string &opertype)
@@ -70,15 +62,40 @@ class ModuleModesOnOper : public Module
 			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 != "")
+				if (!ThisOpersModes.empty())
 				{
-					char* modes[2];
+					char first = *(ThisOpersModes.c_str());
+					if ((first != '+') && (first != '-'))
+						ThisOpersModes = "+" + ThisOpersModes;
+
+					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 = new const char*[size];
 					modes[0] = user->nick;
-					modes[1] = (char*)ThisOpersModes.c_str();
-					Srv->SendMode(modes,2,user);
+
+					// 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, user);
+					delete [] modes;
 				}
 				break;
 			}
@@ -86,29 +103,4 @@ class ModuleModesOnOper : public Module
 	}
 };
 
-// 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(Server* Me)
-	{
-		return new ModuleModesOnOper(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleModesOnOperFactory;
-}
-
+MODULE_INIT(ModuleModesOnOper)