X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=5ab9a93abec393fe165ba7933535ce3636e40be3;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=e50087dbf4936aaec32b44d9ebfab72fd1acbfe9;hpb=e3bd782207f50d131acd008b0cbcc7545aac7690;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index e50087dbf..5ab9a93ab 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,89 +1,62 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005-2006, 2010 Craig Edwards <brain@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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"
-
-/* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
-
 
+#include "inspircd.h"
 
 class ModuleOperLevels : public Module
 {
-	private:
-		ConfigReader* conf;
 	public:
-		ModuleOperLevels(InspIRCd* Me)
-			: Module(Me)
-		{
-			conf = new ConfigReader(ServerInstance);
-			Implementation eventlist[] = { I_OnRehash, I_OnKill };
-			ServerInstance->Modules->Attach(eventlist, this, 2);
-		}
-
-		virtual ~ModuleOperLevels()
+		Version GetVersion() CXX11_OVERRIDE
 		{
-			delete conf;
+			return Version("Allows the server administrator to define ranks for server operators which prevent lower ranked server operators from using /KILL on higher ranked server operators.", VF_VENDOR);
 		}
 
-
-		virtual void OnRehash(User* user, const std::string &parameter)
+		ModResult OnKill(User* source, User* dest, const std::string &reason) CXX11_OVERRIDE
 		{
-			delete conf;
-			conf = new ConfigReader(ServerInstance);
-		}
-
-		virtual Version GetVersion()
-		{
-			return Version(1,2,0,1,VF_VENDOR,API_VERSION);
-		}
-
-		virtual int 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))
+			if (dest->IsOper() && source->IsOper())
 			{
-				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++)
+				unsigned long dest_level = ConvToNum<unsigned long>(dest->oper->getConfig("level"));
+				unsigned long source_level = ConvToNum<unsigned long>(source->oper->getConfig("level"));
+
+				if (dest_level > source_level)
 				{
-					std::string typen = conf->ReadValue("type","name",k);
-					if (typen == source->oper)
+					if (IS_LOCAL(source))
 					{
-						source_level = conf->ReadInteger("type","level",k,true);
-						break;
+						ServerInstance->SNO->WriteGlobalSno('a', "Oper %s (level %lu) attempted to /KILL a higher level oper: %s (level %lu), reason: %s",
+							source->nick.c_str(), source_level, dest->nick.c_str(), dest_level, reason.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.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(481, "%s :Permission Denied - Oper %s is a higher level than you",source->nick.c_str(),dest->nick.c_str());
-					return 1;
+					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;
 		}
-
 };
 
 MODULE_INIT(ModuleOperLevels)
-