Forward port r10133.

[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 dc9e9ab374533eb77d812cf38c909068b52163d6..8d01833d6cc846dcb3431ddad3b73365c72baeba 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -37,8 +37,8 @@ class ModuleOverride : public Module
                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);
+               Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand, I_OnLocalTopicChange };
+               ServerInstance->Modules->Attach(eventlist, this, 7);
        }
 
        virtual void OnRehash(User* user, const std::string &parameter)
@@ -103,13 +103,31 @@ class ModuleOverride : public Module
                return false;
        }
 
+
+       virtual int OnLocalTopicChange(User *source, Channel *channel, const std::string &topic)
+       {
+               if (IS_OPER(source) && CanOverride(source, "TOPIC"))
+               {
+                       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));
+                       }
+
+                       // Explicit allow
+                       return -1;
+               }
+
+               return 0;
+       }
+
        virtual int OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason)
        {
                if (IS_OPER(source) && CanOverride(source,"KICK"))
                {
-                       if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE))
-                       {
-                               ServerInstance->SNO->WriteToSnoMask('O',std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+                       // 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+")");
                        }
                        /* Returning -1 explicitly allows the kick */
                        return -1;