Implement support for IPv6 GeoIP lookups.

[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 cacedd62d7bbb9430f171dbb5f451f4604a018f5..2e02ffddf633472e4972402aad32e1d931ad2ac2 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -35,16 +35,18 @@ class ModuleOperLevels : public Module
                        // 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());
+                                       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, "%s :Permission Denied - Oper %s is a higher level than you",source->nick.c_str(),dest->nick.c_str());
+                                       source->WriteNumeric(ERR_NOPRIVILEGES, InspIRCd::Format("Permission Denied - Oper %s is a higher level than you", dest->nick.c_str()));
                                        return MOD_RES_DENY;
                                }
                        }