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

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 6ed0c2a53..11a82901b 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -16,26 +16,20 @@
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
 class ModuleOperLevels : public Module
 {
-	private:
-		ConfigReader* conf;
 	public:
 		ModuleOperLevels()
-					{
-			conf = new ConfigReader;
+		{
 			Implementation eventlist[] = { I_OnRehash, I_OnKill };
 			ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		virtual ~ModuleOperLevels()
 		{
-			delete conf;
 		}
 
 
 		virtual void OnRehash(User* user)
 		{
-			delete conf;
-			conf = new ConfigReader;
 		}
 
 		virtual Version GetVersion()
@@ -45,29 +39,11 @@ class ModuleOperLevels : public Module
 
 		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 (typen == 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 (typen == 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)
 				{
 					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());