Fix the cloaking module on C++98 compilers.

[user/henk/code/inspircd.git] / src / modules / m_operlevels.cpp

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 1d4302d21d41fab686d74fe07b9120433fa6c86d..5ab9a93abec393fe165ba7933535ce3636e40be3 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,10 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   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) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2005 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2005-2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -20,38 +25,33 @@
  */
 
 
-/* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
-
 #include "inspircd.h"
 
 class ModuleOperLevels : public Module
 {
        public:
-               void init()
-               {
-                       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);
+                       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 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 (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->WriteNotice("*** Oper " + source->nick + " attempted to /kill you!");
-                                       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 level 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;
                                }
                        }