Fix for bug #415, affects only trunk (wish i'd known this before i started!)

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

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index e68d3f76098450245a39a727a435552983d5a586..0f8922854cb451eed08318ae49c0e113a31700da 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -11,10 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 #include "inspircd.h"
 #include "wildcard.h"
 
@@ -33,7 +29,7 @@ class ModuleOverride : public Module
  public:
  
        ModuleOverride(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {               
                // read our config options (main config file)
                OnRehash(NULL,"");
@@ -90,7 +86,7 @@ class ModuleOverride : public Module
                output.append(" OVERRIDE");
        }
 
-       virtual bool CanOverride(userrec* source, char* token)
+       virtual bool CanOverride(userrec* source, const char* token)
        {
                // checks to see if the oper's type has <type:override>
                override_t::iterator j = overrides.find(source->oper);
@@ -107,7 +103,7 @@ class ModuleOverride : public Module
 
        virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
        {
-               if ((*source->oper) && (CanOverride(source,"KICK")))
+               if (IS_OPER(source) && CanOverride(source,"KICK"))
                {
                        if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE))
                        {
@@ -121,7 +117,7 @@ class ModuleOverride : public Module
        
        virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
        {
-               if (*source->oper)
+               if (IS_OPER(source))
                {
                        if (source && channel)
                        {
@@ -232,7 +228,7 @@ class ModuleOverride : public Module
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
-               if (*user->oper)
+               if (IS_OPER(user))
                {
                        if (chan)
                        {
@@ -291,27 +287,4 @@ class ModuleOverride : public Module
        }
 };
 
-
-class ModuleOverrideFactory : public ModuleFactory
-{
- public:
-       ModuleOverrideFactory()
-       {
-       }
-       
-       ~ModuleOverrideFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleOverride(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleOverrideFactory;
-}
+MODULE_INIT(ModuleOverride)