X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=b992b33b61bea8ac9173e06be5f5caf6418759e6;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;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..b992b33b6 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,36 +1,38 @@
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include <string>
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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()
-		{
-
-			Srv = new Server;
+					{
 			conf = new ConfigReader;
+			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)
 		{
 			delete conf;
 			conf = new ConfigReader;
@@ -38,19 +40,20 @@ class ModuleOperLevels : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version(1,0,0,1,VF_VENDOR);
+			return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR, API_VERSION);
 		}
 
-		virtual int OnKill(userrec* source, userrec* dest, std::string reason)
+		virtual ModResult 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++)
 				{
 					std::string typen = conf->ReadValue("type","name",j);
-					if (!strcmp(typen.c_str(),dest->oper))
+					if (typen == dest->oper)
 					{
 						dest_level = conf->ReadInteger("type","level",j,true);
 						break;
@@ -59,7 +62,7 @@ class ModuleOperLevels : public Module
 				for (int k =0; k < conf->Enumerate("type"); k++)
 				{
 					std::string typen = conf->ReadValue("type","name",k);
-					if (!strcmp(typen.c_str(),source->oper))
+					if (typen == source->oper)
 					{
 						source_level = conf->ReadInteger("type","level",k,true);
 						break;
@@ -67,37 +70,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);
-					return 1;
+					if (IS_LOCAL(source)) ServerInstance->SNO->WriteGlobalSno('a', "Oper %s (level %ld) attempted to /kill a higher oper: %s (level %ld): Reason: %s",source->nick.c_str(),source_level,dest->nick.c_str(),dest_level,reason.c_str());
+					dest->WriteServ("NOTICE %s :*** Oper %s attempted to /kill you!",dest->nick.c_str(),source->nick.c_str());
+					source->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper %s is a higher level than you",source->nick.c_str(),dest->nick.c_str());
+					return MOD_RES_DENY;
 				}
 			}
-			return 0;
+			return MOD_RES_PASSTHRU;
 		}
 
 };
 
-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)