X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=2e02ffddf633472e4972402aad32e1d931ad2ac2;hb=a0f7d012791d79b67b56b62415f7901d5e48870f;hp=4fc4c6aef7b8f97654a53b81e2ebb92d9916a104;hpb=83c7cc45daf6fb1f8c36f15297a4657e45a34e88;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 4fc4c6aef..2e02ffddf 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -20,38 +20,33 @@
  */
 
 
-/* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
-
 #include "inspircd.h"
 
 class ModuleOperLevels : public Module
 {
 	public:
-		ModuleOperLevels()
-		{
-			ServerInstance->Modules->Attach(I_OnKill, this);
-		}
-
-		virtual Version GetVersion()
+		Version GetVersion() CXX11_OVERRIDE
 		{
 			return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR);
 		}
 
-		virtual ModResult OnKill(User* source, User* dest, const std::string &reason)
+		ModResult OnKill(User* source, User* dest, const std::string &reason) CXX11_OVERRIDE
 		{
 			// oper killing an oper?
-			if (IS_OPER(dest) && IS_OPER(source))
+			if (dest->IsOper() && source->IsOper())
 			{
-				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());
+				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)
 				{
-					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());
+					if (IS_LOCAL(source))
+					{
+						ServerInstance->SNO->WriteGlobalSno('a', "Oper %s (level %lu) attempted to /kill a higher oper: %s (level %lu): 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;
 				}
 			}
@@ -60,4 +55,3 @@ class ModuleOperLevels : public Module
 };
 
 MODULE_INIT(ModuleOperLevels)
-