X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=bf758b1f76812d894c2693a290110c83d8d46eaa;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=1909ab5c898ae90d78c28c179359a3c79a0edc16;hpb=fd6ee21f2f55875984884a8413d61012e066029f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 1909ab5c8..bf758b1f7 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,113 +1,55 @@
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include <string>
-#include "helperfuncs.h"
-#include "inspircd.h"
-
-/* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 
+#include "inspircd.h"
 
 class ModuleOperLevels : public Module
 {
-
-	private:
-
-		
-		ConfigReader* conf;
-
 	public:
-
-		ModuleOperLevels(InspIRCd* Me)
-			: Module::Module(Me)
-		{
-
-			
-			conf = new ConfigReader;
-		}
-
-		virtual ~ModuleOperLevels()
-		{
-			DELETE(conf);
-		}
-
-		void Implements(char* List)
-		{
-			List[I_OnRehash] = List[I_OnKill] = 1;
-		}
-
-		virtual void OnRehash(const std::string &parameter)
+		Version GetVersion() CXX11_OVERRIDE
 		{
-			DELETE(conf);
-			conf = new ConfigReader;
+			return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR);
 		}
 
-		virtual Version GetVersion()
+		ModResult OnKill(User* source, User* dest, const std::string &reason) CXX11_OVERRIDE
 		{
-			return Version(1,0,0,1,VF_VENDOR);
-		}
-
-		virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
-		{
-			long dest_level = 0,source_level = 0;
 			// oper killing an oper?
-			if (*dest->oper)
+			if (dest->IsOper() && source->IsOper())
 			{
-				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;
-					}
-				}
+				std::string level = dest->oper->getConfig("level");
+				long dest_level = atol(level.c_str());
+				level = source->oper->getConfig("level");
+				long source_level = atol(level.c_str());
+
 				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->WriteNotice("*** Oper " + source->nick + " attempted to /kill you!");
+					source->WriteNumeric(ERR_NOPRIVILEGES, InspIRCd::Format("Permission Denied - Oper %s is a higher level than you", dest->nick.c_str()));
+					return MOD_RES_DENY;
 				}
 			}
-			return 0;
+			return MOD_RES_PASSTHRU;
 		}
-
 };
 
-class ModuleOperLevelsFactory : public ModuleFactory
-{
- public:
-	ModuleOperLevelsFactory()
-	{
-	}
-
-	~ModuleOperLevelsFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		log(DEBUG,"CreateModule");
-		return new ModuleOperLevels(Me);
-	}
-
-};
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperLevelsFactory;
-}
-
+MODULE_INIT(ModuleOperLevels)