X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=11a82901b9371642b61e4a677d0a167a0b060dea;hb=b5965b08c23e3e89404b481386f2e56ce7cb7ce2;hp=b436b953bb21dad3931003ba2e8cf7919c0d1f45;hpb=58385dd458e927994957b6d603f7f9da3fc52e14;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index b436b953b..11a82901b 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -14,73 +14,45 @@
 #include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
-
-
-
 class ModuleOperLevels : public Module
 {
-	private:
-		ConfigReader* conf;
 	public:
-		ModuleOperLevels(InspIRCd* Me)
-			: Module(Me)
+		ModuleOperLevels()
 		{
-			conf = new ConfigReader(ServerInstance);
 			Implementation eventlist[] = { I_OnRehash, I_OnKill };
 			ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		virtual ~ModuleOperLevels()
 		{
-			delete conf;
 		}
 
 
-		virtual void OnRehash(User* user, const std::string &parameter)
+		virtual void OnRehash(User* user)
 		{
-			delete conf;
-			conf = new ConfigReader(ServerInstance);
 		}
 
 		virtual Version GetVersion()
 		{
-			return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+			return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR);
 		}
 
-		virtual int OnKill(User* source, User* dest, const 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 (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))
-					{
-						dest_level = conf->ReadInteger("type","level",j,true);
-						break;
-					}
-				}
-				for (int k =0; k < conf->Enumerate("type"); k++)
-				{
-					std::string typen = conf->ReadValue("type","name",k);
-					if (!strcmp(typen.c_str(),source->oper))
-					{
-						source_level = conf->ReadInteger("type","level",k,true);
-						break;
-					}
-				}
+				long dest_level = atol(dest->oper->getConfig("level").c_str());
+				long source_level = atol(source->oper->getConfig("level").c_str());
 				if (dest_level > source_level)
 				{
-					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->WriteNumeric(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;
 		}
 
 };