More (last of extra)

[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 edfffcca45ac611ce05278742944edeec632c776..e19cf76524c185131c5b2adb745d927a4b083766 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -2,23 +2,20 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "configreader.h"
-#include "inspircd.h"
 #include "wildcard.h"
 
 /* $ModDesc: Provides support for unreal-style oper-override */
@@ -36,16 +33,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);
@@ -110,7 +107,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))
                        {
@@ -124,7 +121,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)
                        {
@@ -134,7 +131,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)
@@ -148,7 +144,6 @@ class ModuleOverride : public Module
                                                }
                                        break;
                                        case AC_OP:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_OP");
                                                if (CanOverride(source,"MODEOP"))
                                                {
                                                        if (NoisyOverride)
@@ -162,7 +157,6 @@ class ModuleOverride : public Module
                                                }
                                        break;
                                        case AC_VOICE:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_VOICE");
                                                if (CanOverride(source,"MODEVOICE"))
                                                {
                                                        if (NoisyOverride)
@@ -176,7 +170,6 @@ class ModuleOverride : public Module
                                                }
                                        break;
                                        case AC_DEVOICE:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_DEVOICE");
                                                if (CanOverride(source,"MODEDEVOICE"))
                                                {
                                                        if (NoisyOverride)
@@ -190,7 +183,6 @@ class ModuleOverride : public Module
                                                }
                                        break;
                                        case AC_HALFOP:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_HALFOP");
                                                if (CanOverride(source,"MODEHALFOP"))
                                                {
                                                        if (NoisyOverride)
@@ -204,7 +196,6 @@ class ModuleOverride : public Module
                                                }
                                        break;
                                        case AC_DEHALFOP:
-                                               ServerInstance->Log(DEBUG,"Override access check AC_DEHALFOP");
                                                if (CanOverride(source,"MODEDEHALFOP"))
                                                {
                                                        if (NoisyOverride)
@@ -224,7 +215,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;
                                        }
@@ -242,7 +232,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)
                        {
@@ -321,7 +311,7 @@ class ModuleOverrideFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleOverrideFactory;
 }