Annotations

[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 2e8ed797f02c6b603f3b63f17d094daaf7875b3e..bb5121771322a861f7149f7505d238f709c668ee 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -30,6 +30,9 @@ class ModuleOverride : public Module
        
        override_t overrides;
        bool NoisyOverride;
+       bool OverriddenMode;
+       int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops;
+
  public:
  
        ModuleOverride(InspIRCd* Me)
@@ -38,6 +41,8 @@ class ModuleOverride : public Module
                // read our config options (main config file)
                OnRehash("");
                ServerInstance->SNO->EnableSnomask('O',"OVERRIDE");
+               OverriddenMode = false;
+               OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
        }
        
        virtual void OnRehash(const std::string &parameter)
@@ -60,7 +65,27 @@ class ModuleOverride : public Module
 
        void Implements(char* List)
        {
-               List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = 1;
+               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)
+       {
+               if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
+               {
+                       int Total = OverOps + OverDeops + OverVoices + OverDevoices + OverHalfops + OverDehalfops;
+
+                       ServerInstance->SNO->WriteToSnoMask('O',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" : "")+" " : "")+
+                                       (OverDevoices ? ConvToStr(OverDevoices)+" devoice"+(OverDevoices != 1 ? "s" : "")+" " : "")+
+                                       (OverHalfops ? ConvToStr(OverHalfops)+" halfop"+(OverHalfops != 1 ? "s" : "")+" " : "")+
+                                       (OverDehalfops ? ConvToStr(OverDehalfops)+" dehalfop"+(OverDehalfops != 1 ? "s" : "") : "")
+                                       +(Total ? "]" : ""));
+
+                       OverriddenMode = false;
+                       OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
+               }
        }
 
        virtual void On005Numeric(std::string &output)
@@ -89,7 +114,7 @@ class ModuleOverride : public Module
                {
                        if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+                               ServerInstance->SNO->WriteToSnoMask('O',std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
                        }
                        /* Returning -1 explicitly allows the kick */
                        return -1;
@@ -109,77 +134,100 @@ class ModuleOverride : public Module
                                switch (access_type)
                                {
                                        case AC_DEOP:
+                                               ServerInstance->Log(DEBUG,"Override access check AC_DEOP");
                                                if (CanOverride(source,"MODEDEOP"))
                                                {
-                                                       if ((!channel->HasUser(source)) || (mode != STATUS_OP))
-                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Deopped "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                       if (NoisyOverride)
+                                                       if ((!channel->HasUser(source)) || (mode < STATUS_OP))
+                                                               OverDeops++;
                                                        return ACR_ALLOW;
                                                }
                                                else
                                                {
                                                        return ACR_DEFAULT;
                                                }
+                                       break;
                                        case AC_OP:
+                                               ServerInstance->Log(DEBUG,"Override access check AC_OP");
                                                if (CanOverride(source,"MODEOP"))
                                                {
-                                                       if ((!channel->HasUser(source)) || (mode != STATUS_OP))
-                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Opped "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                       if (NoisyOverride)
+                                                       if ((!channel->HasUser(source)) || (mode < STATUS_OP))
+                                                               OverOps++;
                                                        return ACR_ALLOW;
                                                }
                                                else
                                                {
                                                        return ACR_DEFAULT;
                                                }
+                                       break;
                                        case AC_VOICE:
+                                               ServerInstance->Log(DEBUG,"Override access check AC_VOICE");
                                                if (CanOverride(source,"MODEVOICE"))
                                                {
+                                                       if (NoisyOverride)
                                                        if ((!channel->HasUser(source)) || (mode < STATUS_HOP))
-                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Voiced "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                               OverVoices++;
                                                        return ACR_ALLOW;
                                                }
                                                else
                                                {
                                                        return ACR_DEFAULT;
                                                }
+                                       break;
                                        case AC_DEVOICE:
+                                               ServerInstance->Log(DEBUG,"Override access check AC_DEVOICE");
                                                if (CanOverride(source,"MODEDEVOICE"))
                                                {
+                                                       if (NoisyOverride)
                                                        if ((!channel->HasUser(source)) || (mode < STATUS_HOP))
-                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Devoiced "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                               OverDevoices++;
                                                        return ACR_ALLOW;
                                                }
                                                else
                                                {
                                                        return ACR_DEFAULT;
                                                }
+                                       break;
                                        case AC_HALFOP:
+                                               ServerInstance->Log(DEBUG,"Override access check AC_HALFOP");
                                                if (CanOverride(source,"MODEHALFOP"))
                                                {
-                                                       if ((!channel->HasUser(source)) || (mode != STATUS_OP))
-                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Halfopped "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                       if (NoisyOverride)
+                                                       if ((!channel->HasUser(source)) || (mode < STATUS_OP))
+                                                               OverHalfops++;
                                                        return ACR_ALLOW;
                                                }
                                                else
                                                {
                                                        return ACR_DEFAULT;
                                                }
+                                       break;
                                        case AC_DEHALFOP:
+                                               ServerInstance->Log(DEBUG,"Override access check AC_DEHALFOP");
                                                if (CanOverride(source,"MODEDEHALFOP"))
                                                {
-                                                       if ((!channel->HasUser(source)) || (mode != STATUS_OP))
-                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Dehalfopped "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                       if (NoisyOverride)
+                                                       if ((!channel->HasUser(source)) || (mode < STATUS_OP))
+                                                               OverDehalfops++;
                                                        return ACR_ALLOW;
                                                }
                                                else
                                                {
                                                        return ACR_DEFAULT;
-                                       }
+                                               }
+                                       break;
                                }
                        
                                if (CanOverride(source,"OTHERMODE"))
                                {
-                                       if ((!channel->HasUser(source)) || (mode != STATUS_OP))
-                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" changed modes on "+std::string(channel->name));
+                                       if (NoisyOverride)
+                                       if ((!channel->HasUser(source)) || (mode < STATUS_OP))
+                                       {
+                                               ServerInstance->Log(DEBUG,"Overridden mode");
+                                               OverriddenMode = true;
+                                               OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
+                                       }
                                        return ACR_ALLOW;
                                }
                                else