PROPAGATE this fix

[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 f8fdb89d69760b416224d9d846f304702b48afcb..4c4047caae8cc3b4676c55de4fcbf2c5a1298e9b 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include <string>
-
 #include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
@@ -33,7 +28,7 @@ class ModuleOperLevels : public Module
        public:
 
                ModuleOperLevels(InspIRCd* Me)
-                       : Module::Module(Me)
+                       : Module(Me)
                {
 
                        
@@ -64,8 +59,9 @@ class ModuleOperLevels : public Module
                virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
                {
                        long dest_level = 0,source_level = 0;
+
                        // oper killing an oper?
-                       if (*dest->oper)
+                       if (IS_OPER(dest) && IS_OPER(source))
                        {
                                for (int j =0; j < conf->Enumerate("type"); j++)
                                {
@@ -89,7 +85,7 @@ class ModuleOperLevels : public Module
                                {
                                        ServerInstance->WriteOpers("Oper %s (level %d) attempted to /kill a higher oper: %s (level %d): Reason: %s",source->nick,source_level,dest->nick,dest_level,reason.c_str());
                                        dest->WriteServ("NOTICE %s :Oper %s attempted to /kill you!",dest->nick,source->nick);
-                                       source->WriteServ("481 %s :Permission Denied- Oper %s is a higher level than you",source->nick,dest->nick);
+                                       source->WriteServ("481 %s :Permission Denied - Oper %s is a higher level than you",source->nick,dest->nick);
                                        return 1;
                                }
                        }
@@ -98,26 +94,5 @@ class ModuleOperLevels : public Module
 
 };
 
-class ModuleOperLevelsFactory : public ModuleFactory
-{
- public:
-       ModuleOperLevelsFactory()
-       {
-       }
-
-       ~ModuleOperLevelsFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleOperLevels(Me);
-       }
-
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleOperLevelsFactory;
-}
+MODULE_INIT(ModuleOperLevels)