X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=4cf360e2a90618391f274595ed9a1d4b5b5d32f9;hb=9dd72b7003963d868a23da930a91300b49ab4959;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..4cf360e2a 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -19,6 +19,7 @@ using namespace std;
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
+#include "inspircd.h"
 #include "modules.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
@@ -40,12 +41,18 @@ class ModuleModesOnOper : public Module
 
 	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;
 	}
 	
 	virtual ~ModuleModesOnOper()
 	{
-		delete Conf;
+		DELETE(Conf);
 	}
 	
 	virtual Version GetVersion()
@@ -53,17 +60,17 @@ class ModuleModesOnOper : public Module
 		return Version(1,0,0,1,VF_VENDOR);
 	}
 	
-	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;
@@ -74,9 +81,9 @@ class ModuleModesOnOper : public Module
 					modes[1] = (char*)ThisOpersModes.c_str();
 					Srv->SendMode(modes,2,user);
 				}
-                                break;
-                        }
-                }
+				break;
+			}
+		}
 	}
 };