No idea why this wasn't using MODULE_INIT. Thanks Om.

[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 d394ea8eb72d027cca024d28a0c930ff44d2ca24..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,16 +29,16 @@ class ModuleOverride : public Module
  public:
  
        ModuleOverride(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {               
                // read our config options (main config file)
-               OnRehash("");
+               OnRehash(NULL,"");
                ServerInstance->SNO->EnableSnomask('O',"OVERRIDE");
                OverriddenMode = false;
                OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
        }
        
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                // on a rehash we delete our classes for good measure and create them again.
                ConfigReader* Conf = new ConfigReader(ServerInstance);
@@ -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)
                        {
@@ -131,7 +127,6 @@ class ModuleOverride : public Module
                                switch (access_type)
                                {
                                        case AC_DEOP:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_DEOP");
                                                if (CanOverride(source,"MODEDEOP"))
                                                {
                                                        if (NoisyOverride)
@@ -145,7 +140,6 @@ class ModuleOverride : public Module
                                                }
                                        break;
                                        case AC_OP:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_OP");
                                                if (CanOverride(source,"MODEOP"))
                                                {
                                                        if (NoisyOverride)
@@ -159,7 +153,6 @@ class ModuleOverride : public Module
                                                }
                                        break;
                                        case AC_VOICE:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_VOICE");
                                                if (CanOverride(source,"MODEVOICE"))
                                                {
                                                        if (NoisyOverride)
@@ -173,7 +166,6 @@ class ModuleOverride : public Module
                                                }
                                        break;
                                        case AC_DEVOICE:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_DEVOICE");
                                                if (CanOverride(source,"MODEDEVOICE"))
                                                {
                                                        if (NoisyOverride)
@@ -187,7 +179,6 @@ class ModuleOverride : public Module
                                                }
                                        break;
                                        case AC_HALFOP:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_HALFOP");
                                                if (CanOverride(source,"MODEHALFOP"))
                                                {
                                                        if (NoisyOverride)
@@ -201,7 +192,6 @@ class ModuleOverride : public Module
                                                }
                                        break;
                                        case AC_DEHALFOP:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_DEHALFOP");
                                                if (CanOverride(source,"MODEDEHALFOP"))
                                                {
                                                        if (NoisyOverride)
@@ -221,7 +211,6 @@ class ModuleOverride : public Module
                                        if (NoisyOverride)
                                        if ((!channel->HasUser(source)) || (mode < STATUS_OP))
                                        {
-                                               ServerInstance->Log(DEBUG,"Overridden mode");
                                                OverriddenMode = true;
                                                OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
                                        }
@@ -239,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)
                        {
@@ -298,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)