Remove InspIRCd* parameters and fields

[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 29b24354ea6b5943b077211fc062c88402d6c9ec..b992b33b61bea8ac9173e06be5f5caf6418759e6 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -14,18 +14,14 @@
 #include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
-
-
-
 class ModuleOperLevels : public Module
 {
        private:
                ConfigReader* conf;
        public:
-               ModuleOperLevels(InspIRCd* Me)
-                       : Module(Me)
-               {
-                       conf = new ConfigReader(ServerInstance);
+               ModuleOperLevels()
+                                       {
+                       conf = new ConfigReader;
                        Implementation eventlist[] = { I_OnRehash, I_OnKill };
                        ServerInstance->Modules->Attach(eventlist, this, 2);
                }
@@ -36,18 +32,18 @@ class ModuleOperLevels : public Module
                }
 
 
-               virtual void OnRehash(User* user, const std::string &parameter)
+               virtual void OnRehash(User* user)
                {
                        delete conf;
-                       conf = new ConfigReader(ServerInstance);
+                       conf = new ConfigReader;
                }
 
                virtual Version GetVersion()
                {
-                       return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+                       return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR, API_VERSION);
                }
 
-               virtual int OnKill(User* source, User* dest, const std::string &reason)
+               virtual ModResult OnKill(User* source, User* dest, const std::string &reason)
                {
                        long dest_level = 0,source_level = 0;
 
@@ -74,13 +70,13 @@ class ModuleOperLevels : public Module
                                }
                                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());
+                                       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());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
-                       return 0;
+                       return MOD_RES_PASSTHRU;
                }
 
 };