X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=10176846cb0618b1be347f22e7086ff19c87e7fb;hb=bcac49dca78631687975771c6d0a76b595171664;hp=a49cb34e8e9aaf3d065c084717542febb2b161ca;hpb=a3c403ef79b483026cfc87ded6091b8940971732;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index a49cb34e8..10176846c 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -17,8 +17,10 @@
 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,56 +29,86 @@ class ModuleModesOnOper : public Module
 {
  private:
 
-	Server *Srv;
+	
 	ConfigReader *Conf;
 
  public:
-	ModuleModesOnOper(Server* Me)
+	ModuleModesOnOper(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		Conf = new ConfigReader;
+		
+		Conf = new ConfigReader(ServerInstance);
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnOper] = 1;
+		List[I_OnPostOper] = List[I_OnRehash] = 1;
+	}
+
+	virtual void OnRehash(const std::string &parameter)
+	{
+		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 OnOper(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;
+					const char* modes[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();
+							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;
-                        }
-                }
+				break;
+			}
+		}
 	}
 };
 
@@ -93,7 +125,7 @@ class ModuleModesOnOperFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleModesOnOper(Me);
 	}