X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=ab4fee21f351d8ebd4c155a23b374169c37e027b;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=a112040f9b96469b9f0b3edc26b577a23c877473;hpb=ab01aaeeee9aed655df2eec2522072233fe3aa57;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index a112040f9..ab4fee21f 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -4,38 +4,45 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include <string>
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
 
-Server *Srv;
+
 
 class ModuleOperLevels : public Module
 {
 
 	private:
 
+		
 		ConfigReader* conf;
 
 	public:
 
-		ModuleOperLevels()
+		ModuleOperLevels(InspIRCd* Me)
+			: Module::Module(Me)
 		{
 
-			Srv = new Server;
-			conf = new ConfigReader;
+			
+			conf = new ConfigReader(ServerInstance);
 		}
 
 		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;
-			conf = new ConfigReader;
+			DELETE(conf);
+			conf = new ConfigReader(ServerInstance);
 		}
 
 		virtual Version GetVersion()
@@ -43,11 +50,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++)
 				{
@@ -69,9 +76,9 @@ class ModuleOperLevels : public Module
 				}
 				if (dest_level > source_level)
 				{
-					WriteOpers("Oper %s (level %d) attempted to /kill a higher oper: %s (level %d): Reason: %s",source->nick,source_level,dest->nick,dest_level,reason.c_str());
-					WriteServ(dest->fd,"NOTICE %s :Oper %s attempted to /kill you!",dest->nick,source->nick);
-					WriteServ(source->fd,"481 %s :Permission Denied- Oper %s is a higher level than you",source->nick,dest->nick);
+					ServerInstance->WriteOpers("Oper %s (level %d) attempted to /kill a higher oper: %s (level %d): Reason: %s",source->nick,source_level,dest->nick,dest_level,reason.c_str());
+					dest->WriteServ("NOTICE %s :Oper %s attempted to /kill you!",dest->nick,source->nick);
+					source->WriteServ("481 %s :Permission Denied- Oper %s is a higher level than you",source->nick,dest->nick);
 					return 1;
 				}
 			}
@@ -83,23 +90,23 @@ class ModuleOperLevels : public Module
 class ModuleOperLevelsFactory : public ModuleFactory
 {
  public:
-        ModuleOperLevelsFactory()
-        {
-        }
+	ModuleOperLevelsFactory()
+	{
+	}
 
-        ~ModuleOperLevelsFactory()
-        {
-        }
+	~ModuleOperLevelsFactory()
+	{
+	}
 
-        virtual Module * CreateModule()
-        {
-                return new ModuleOperLevels;
-        }
+	virtual Module * CreateModule(InspIRCd* Me)
+	{
+		return new ModuleOperLevels(Me);
+	}
 
 };
 
 extern "C" void * init_module( void )
 {
-        return new ModuleOperLevelsFactory;
+	return new ModuleOperLevelsFactory;
 }