X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=8df45f0fcf807fd9c65121555554fd68aa90776d;hb=c4458ecc70025aeac7ca87115ed0a698e7bbcdad;hp=271c3cb4533446d7f50b81720b5ed7cc90ca492f;hpb=eb4229deed0281ae566ef7e55a144e5d3183a4b2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 271c3cb45..8df45f0fc 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,3 +1,5 @@
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
@@ -6,33 +8,37 @@
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
 
-Server *Srv;
-
 class ModuleOperLevels : public Module
 {
 
 	private:
 
+		Server* Srv;
 		ConfigReader* conf;
 
 	public:
 
-		ModuleOperLevels()
+		ModuleOperLevels(Server* Me)
+			: Module::Module(Me)
 		{
 
-			Srv = new Server;
+			Srv = Me;
 			conf = new ConfigReader;
 		}
 
 		virtual ~ModuleOperLevels()
 		{
-			delete Srv;
-			delete conf;
+			DELETE(conf);
+		}
+
+		void Implements(char* List)
+		{
+			List[I_OnRehash] = List[I_OnKill] = 1;
 		}
 
-		virtual void OnRehash()
+		virtual void OnRehash(const std::string &parameter)
 		{
-			delete conf;
+			DELETE(conf);
 			conf = new ConfigReader;
 		}
 
@@ -41,11 +47,11 @@ class ModuleOperLevels : public Module
 			return Version(1,0,0,1,VF_VENDOR);
 		}
 
-		virtual int OnKill(userrec* source, userrec* dest, std::string reason)
+		virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
 		{
 			long dest_level = 0,source_level = 0;
 			// oper killing an oper?
-			if (strchr(dest->modes,'o'))
+			if (*dest->oper)
 			{
 				for (int j =0; j < conf->Enumerate("type"); j++)
 				{
@@ -81,23 +87,24 @@ class ModuleOperLevels : public Module
 class ModuleOperLevelsFactory : public ModuleFactory
 {
  public:
-        ModuleOperLevelsFactory()
-        {
-        }
+	ModuleOperLevelsFactory()
+	{
+	}
 
-        ~ModuleOperLevelsFactory()
-        {
-        }
+	~ModuleOperLevelsFactory()
+	{
+	}
 
-        virtual Module * CreateModule()
-        {
-                return new ModuleOperLevels;
-        }
+	virtual Module * CreateModule(Server* Me)
+	{
+		log(DEBUG,"CreateModule");
+		return new ModuleOperLevels(Me);
+	}
 
 };
 
 extern "C" void * init_module( void )
 {
-        return new ModuleOperLevelsFactory;
+	return new ModuleOperLevelsFactory;
 }