X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=b436b953bb21dad3931003ba2e8cf7919c0d1f45;hb=52671661f8fdca0b61aec8009b4bc7de9bc00166;hp=54422f0171b7a2779be41def03ec266da7499ae3;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 54422f017..b436b953b 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include <string>
-
 #include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
@@ -24,48 +19,40 @@
 
 class ModuleOperLevels : public Module
 {
-
 	private:
-
-		
 		ConfigReader* conf;
-
 	public:
-
 		ModuleOperLevels(InspIRCd* Me)
-			: Module::Module(Me)
+			: Module(Me)
 		{
-
-			
 			conf = new ConfigReader(ServerInstance);
+			Implementation eventlist[] = { I_OnRehash, I_OnKill };
+			ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		virtual ~ModuleOperLevels()
 		{
-			DELETE(conf);
+			delete conf;
 		}
 
-		void Implements(char* List)
-		{
-			List[I_OnRehash] = List[I_OnKill] = 1;
-		}
 
-		virtual void OnRehash(const std::string &parameter)
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
-			DELETE(conf);
+			delete conf;
 			conf = new ConfigReader(ServerInstance);
 		}
 
 		virtual Version GetVersion()
 		{
-			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+			return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 		}
 
-		virtual int OnKill(userrec* source, userrec* dest, const 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 (*dest->oper)
+			if (IS_OPER(dest) && IS_OPER(source))
 			{
 				for (int j =0; j < conf->Enumerate("type"); j++)
 				{
@@ -87,9 +74,9 @@ class ModuleOperLevels : public Module
 				}
 				if (dest_level > source_level)
 				{
-					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());
+					ServerInstance->SNO->WriteToSnoMask('A', "Oper %s (level %ld) attempted to /kill a higher oper: %s (level %ld): 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);
+					source->WriteNumeric(481, "%s :Permission Denied - Oper %s is a higher level than you",source->nick,dest->nick);
 					return 1;
 				}
 			}
@@ -98,26 +85,5 @@ class ModuleOperLevels : public Module
 
 };
 
-class ModuleOperLevelsFactory : public ModuleFactory
-{
- public:
-	ModuleOperLevelsFactory()
-	{
-	}
-
-	~ModuleOperLevelsFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOperLevels(Me);
-	}
-
-};
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperLevelsFactory;
-}
+MODULE_INIT(ModuleOperLevels)