X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=1181a32c35d631cd166d2434751efc2521888f53;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=063e675fc52b6062b6c145ef637c5fdf647d86dc;hpb=ebd92418f89acb456207a05420b71a6f0f27c3f4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 063e675fc..1181a32c3 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -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 */
@@ -31,16 +32,27 @@ class ModuleModesOnOper : public Module
 	ConfigReader *Conf;
 
  public:
-	ModuleModesOnOper()
+	ModuleModesOnOper(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
+		Srv = Me;
+		Conf = new ConfigReader;
+	}
+
+	void Implements(char* List)
+	{
+		List[I_OnPostOper] = List[I_OnRehash] = 1;
+	}
+
+	virtual void OnRehash(const std::string &parameter)
+	{
+		DELETE(Conf);
 		Conf = new ConfigReader;
 	}
 	
 	virtual ~ModuleModesOnOper()
 	{
-		delete Conf;
-		delete Srv;
+		DELETE(Conf);
 	}
 	
 	virtual Version GetVersion()
@@ -48,27 +60,30 @@ class ModuleModesOnOper : public Module
 		return Version(1,0,0,1,VF_VENDOR);
 	}
 	
-	virtual void OnOper(userrec* user)
+	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];
+					const char* modes[2];
 					modes[0] = user->nick;
-					modes[1] = (char*)ThisOpersModes.c_str();
+					modes[1] = ThisOpersModes.c_str();
 					Srv->SendMode(modes,2,user);
 				}
-                                break;
-                        }
-                }
+				break;
+			}
+		}
 	}
 };
 
@@ -85,9 +100,9 @@ class ModuleModesOnOperFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleModesOnOper;
+		return new ModuleModesOnOper(Me);
 	}
 	
 };