Fix m_chanlog crashing.

[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 d86f87b2acbecb15559b46ea8779891baa39b66a..253b200bcfea7d7607c1bb0bb2ec58d9b7cb50bd 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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,18 @@ class ModuleOverride : public Module
  public:
  
        ModuleOverride(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {               
                // read our config options (main config file)
                OnRehash(NULL,"");
                ServerInstance->SNO->EnableSnomask('O',"OVERRIDE");
                OverriddenMode = false;
                OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
+               Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand };
+               ServerInstance->Modules->Attach(eventlist, this, 6);
        }
        
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                // on a rehash we delete our classes for good measure and create them again.
                ConfigReader* Conf = new ConfigReader(ServerInstance);
@@ -57,15 +55,11 @@ class ModuleOverride : public Module
                        overrides[typen] = tokenlist;
                }
                
-               DELETE(Conf);
+               delete Conf;
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = List[I_OnPostCommand] = 1;
-       }
 
-       virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
+       virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line)
        {
                if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
                {
@@ -90,7 +84,7 @@ class ModuleOverride : public Module
                output.append(" OVERRIDE");
        }
 
-       virtual bool CanOverride(userrec* source, char* token)
+       virtual bool CanOverride(User* source, const char* token)
        {
                // checks to see if the oper's type has <type:override>
                override_t::iterator j = overrides.find(source->oper);
@@ -105,9 +99,9 @@ class ModuleOverride : public Module
                return false;
        }
 
-       virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
+       virtual int OnUserPreKick(User* source, User* user, Channel* 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))
                        {
@@ -119,9 +113,9 @@ class ModuleOverride : public Module
                return 0;
        }
        
-       virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+       virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
        {
-               if (*source->oper)
+               if (IS_OPER(source))
                {
                        if (source && channel)
                        {
@@ -131,7 +125,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 +138,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 +151,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 +164,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 +177,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 +190,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 +209,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;
                                        }
@@ -237,9 +224,9 @@ class ModuleOverride : public Module
                return ACR_DEFAULT;
        }
        
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
        {
-               if (*user->oper)
+               if (IS_OPER(user))
                {
                        if (chan)
                        {
@@ -298,27 +285,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)