X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_operlevels.cpp;h=334bdfd7a42f6ae953029f5e439896d5dd6f0d05;hb=53afaa7cadcdf222dcf761441727305f79b4c557;hp=69954b208c9afdb2d838465d87390edbec8d04e1;hpb=ec7fc489a14af54738da17a94b162a9606df4756;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 69954b208..334bdfd7a 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,50 +1,65 @@
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include <string>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#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(Me)
 		{
 
-			Srv = new Server;
-			conf = new ConfigReader;
+			
+			conf = new ConfigReader(ServerInstance);
+		Implementation eventlist[] = { I_OnRehash, I_OnKill };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		virtual ~ModuleOperLevels()
 		{
-			delete Srv;
 			delete conf;
 		}
 
-		virtual void OnRehash()
+
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
 			delete conf;
-			conf = new ConfigReader;
+			conf = new ConfigReader(ServerInstance);
 		}
 
 		virtual Version GetVersion()
 		{
-			return Version(1,0,0,1,VF_VENDOR);
+			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 		}
 
-		virtual int OnKill(userrec* source, userrec* dest, std::string reason)
+		virtual int OnKill(User* source, User* dest, const std::string &reason)
 		{
 			long dest_level = 0,source_level = 0;
+
 			// oper killing an oper?
-			if (strchr(dest->modes,'o'))
+			if (IS_OPER(dest) && IS_OPER(source))
 			{
 				for (int j =0; j < conf->Enumerate("type"); j++)
 				{
@@ -66,37 +81,16 @@ 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;
 				}
-				return 0;
 			}
+			return 0;
 		}
 
 };
 
-class ModuleOperLevelsFactory : public ModuleFactory
-{
- public:
-        ModuleOperLevelsFactory()
-        {
-        }
-
-        ~ModuleOperLevelsFactory()
-        {
-        }
-
-        virtual Module * CreateModule()
-        {
-                return new ModuleOperLevels;
-        }
-
-};
-
-extern "C" void * init_module( void )
-{
-        return new ModuleOperLevelsFactory;
-}
+MODULE_INIT(ModuleOperLevels)