X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=6753daae9663be6e53e441ac1e2e56b4bd81eb6f;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=b516555925645a6b44f9fe6f47f04a087aaa2c71;hpb=0739e7c099618eb1848f5a72ec4d896095033a76;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index b51655592..6753daae9 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -8,33 +8,37 @@ using namespace std;
 
 /* $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(std::string parameter)
+		virtual void OnRehash(const std::string &parameter)
 		{
-			delete conf;
+			DELETE(conf);
 			conf = new ConfigReader;
 		}
 
@@ -43,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++)
 				{
@@ -70,8 +74,8 @@ 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);
+					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 +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;
 }