X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=b992b33b61bea8ac9173e06be5f5caf6418759e6;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=c7fa0a6424bf43c509f6ed59dda9a4555bca5013;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index c7fa0a642..b992b33b6 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-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -14,49 +14,36 @@
 #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)
-		{
-
-			
-			conf = new ConfigReader(ServerInstance);
+		ModuleOperLevels()
+					{
+			conf = new ConfigReader;
+			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(User* user, const std::string &parameter)
+		virtual void OnRehash(User* user)
 		{
-			DELETE(conf);
-			conf = new ConfigReader(ServerInstance);
+			delete conf;
+			conf = new ConfigReader;
 		}
 
 		virtual Version GetVersion()
 		{
-			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+			return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR, API_VERSION);
 		}
 
-		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;
 
@@ -66,7 +53,7 @@ class ModuleOperLevels : public Module
 				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;
@@ -75,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;
@@ -83,13 +70,13 @@ 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());
-					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;
+					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;
 		}
 
 };