Rip flood/threshold out of config classes also.

[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 8d01833d6cc846dcb3431ddad3b73365c72baeba..2dc16ebc9e2f26e7bd6071d4a773079fb4a79377 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides support for unreal-style oper-override */
 
@@ -20,7 +19,6 @@ typedef std::map<std::string,std::string> override_t;
 
 class ModuleOverride : public Module
 {
-
        override_t overrides;
        bool RequireKey;
        bool NoisyOverride;
@@ -34,7 +32,7 @@ class ModuleOverride : public Module
        {
                // read our config options (main config file)
                OnRehash(NULL,"");
-               ServerInstance->SNO->EnableSnomask('O', "OVERRIDE");
+               ServerInstance->SNO->EnableSnomask('G', "GODMODE");
                OverriddenMode = false;
                OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
                Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand, I_OnLocalTopicChange };
@@ -65,11 +63,13 @@ class ModuleOverride : public Module
 
        virtual void OnPostCommand(const std::string &command, const std::vector<std::string> &parameters, User *user, CmdResult result, const std::string &original_line)
        {
-               if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
+               if ((OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
                {
                        int Total = OverOps + OverDeops + OverVoices + OverDevoices + OverHalfops + OverDehalfops;
+                       if (Total == 0)
+                               return;
 
-                       ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" Overriding modes: "+ServerInstance->Modes->GetLastParse()+" "+(Total ? "[Detail: " : "")+
+                       ServerInstance->SNO->WriteToSnoMask('G',std::string(user->nick)+" Overriding modes: "+ServerInstance->Modes->GetLastParse()+" "+(Total ? "[Detail: " : "")+
                                        (OverOps ? ConvToStr(OverOps)+" op"+(OverOps != 1 ? "s" : "")+" " : "")+
                                        (OverDeops ? ConvToStr(OverDeops)+" deop"+(OverDeops != 1 ? "s" : "")+" " : "")+
                                        (OverVoices ? ConvToStr(OverVoices)+" voice"+(OverVoices != 1 ? "s" : "")+" " : "")+
@@ -110,7 +110,7 @@ class ModuleOverride : public Module
                {
                        if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetStatus(source) < STATUS_HOP))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('O',std::string(source->nick)+"  used oper override to change a topic on "+std::string(channel->name));
+                               ServerInstance->SNO->WriteToSnoMask('G',std::string(source->nick)+"  used oper override to change a topic on "+std::string(channel->name));
                        }
 
                        // Explicit allow
@@ -127,7 +127,7 @@ class ModuleOverride : public Module
                        // If the kicker's status is less than the target's,                    or      the kicker's status is less than or equal to voice
                        if ((chan->GetStatus(source) < chan->GetStatus(user))                   || (chan->GetStatus(source) <= STATUS_VOICE))
                        {                               
-                               ServerInstance->SNO->WriteToSnoMask('O',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+                               ServerInstance->SNO->WriteToSnoMask('G',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
                        }
                        /* Returning -1 explicitly allows the kick */
                        return -1;
@@ -149,7 +149,6 @@ class ModuleOverride : public Module
                                        case AC_DEOP:
                                                if (CanOverride(source,"MODEDEOP"))
                                                {
-                                                       if (NoisyOverride)
                                                        if ((!channel->HasUser(source)) || (mode < STATUS_OP))
                                                                OverDeops++;
                                                        return ACR_ALLOW;
@@ -162,7 +161,6 @@ class ModuleOverride : public Module
                                        case AC_OP:
                                                if (CanOverride(source,"MODEOP"))
                                                {
-                                                       if (NoisyOverride)
                                                        if ((!channel->HasUser(source)) || (mode < STATUS_OP))
                                                                OverOps++;
                                                        return ACR_ALLOW;
@@ -175,7 +173,6 @@ class ModuleOverride : public Module
                                        case AC_VOICE:
                                                if (CanOverride(source,"MODEVOICE"))
                                                {
-                                                       if (NoisyOverride)
                                                        if ((!channel->HasUser(source)) || (mode < STATUS_HOP))
                                                                OverVoices++;
                                                        return ACR_ALLOW;
@@ -188,7 +185,6 @@ class ModuleOverride : public Module
                                        case AC_DEVOICE:
                                                if (CanOverride(source,"MODEDEVOICE"))
                                                {
-                                                       if (NoisyOverride)
                                                        if ((!channel->HasUser(source)) || (mode < STATUS_HOP))
                                                                OverDevoices++;
                                                        return ACR_ALLOW;
@@ -201,7 +197,6 @@ class ModuleOverride : public Module
                                        case AC_HALFOP:
                                                if (CanOverride(source,"MODEHALFOP"))
                                                {
-                                                       if (NoisyOverride)
                                                        if ((!channel->HasUser(source)) || (mode < STATUS_OP))
                                                                OverHalfops++;
                                                        return ACR_ALLOW;
@@ -214,7 +209,6 @@ class ModuleOverride : public Module
                                        case AC_DEHALFOP:
                                                if (CanOverride(source,"MODEDEHALFOP"))
                                                {
-                                                       if (NoisyOverride)
                                                        if ((!channel->HasUser(source)) || (mode < STATUS_OP))
                                                                OverDehalfops++;
                                                        return ACR_ALLOW;
@@ -228,7 +222,6 @@ class ModuleOverride : public Module
 
                                if (CanOverride(source,"OTHERMODE"))
                                {
-                                       if (NoisyOverride)
                                        if ((!channel->HasUser(source)) || (mode < STATUS_OP))
                                        {
                                                OverriddenMode = true;
@@ -266,7 +259,7 @@ class ModuleOverride : public Module
 
                                                if (NoisyOverride)
                                                        chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str());
-                                               ServerInstance->SNO->WriteToSnoMask('O', user->nick+" used oper override to bypass +i on "+std::string(cname));
+                                               ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
                                        }
                                        return -1;
                                }
@@ -282,7 +275,7 @@ class ModuleOverride : public Module
 
                                        if (NoisyOverride)
                                                chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str());
-                                       ServerInstance->SNO->WriteToSnoMask('O', user->nick+" used oper override to bypass +k on "+std::string(cname));
+                                       ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
                                        return -1;
                                }
 
@@ -297,25 +290,22 @@ class ModuleOverride : public Module
 
                                        if (NoisyOverride)
                                                chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str());
-                                       ServerInstance->SNO->WriteToSnoMask('O', user->nick+" used oper override to bypass +l on "+std::string(cname));
+                                       ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
                                        return -1;
                                }
 
-                               if (CanOverride(user,"BANWALK"))
+                               if (chan->IsBanned(user) && CanOverride(user,"BANWALK"))
                                {
-                                       if (chan->IsBanned(user))
+                                       if (RequireKey && keygiven != "override")
                                        {
-                                               if (RequireKey && keygiven != "override")
-                                               {
-                                                       // Can't join normally -- must use a special key to bypass restrictions
-                                                       user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
-                                                       return 1;
-                                               }
-
-                                               if (NoisyOverride)
-                                                       chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
-                                               ServerInstance->SNO->WriteToSnoMask('O',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
+                                               // Can't join normally -- must use a special key to bypass restrictions
+                                               user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
+                                               return 1;
                                        }
+
+                                       if (NoisyOverride)
+                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
                                        return -1;
                                }
                        }
@@ -325,12 +315,12 @@ class ModuleOverride : public Module
 
        virtual ~ModuleOverride()
        {
-               ServerInstance->SNO->DisableSnomask('O');
+               ServerInstance->SNO->DisableSnomask('G');
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 };