Merge pull request #1284 from Adam-/insp20+preregcloak

[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 76d6ee469635d0c4fbbcfd852f86664996cd7a4e..3e42c4f7927885f023bc9b5bf05775b21f8a28a8 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -33,25 +33,37 @@ class ModuleOverride : public Module
        bool RequireKey;
        bool NoisyOverride;
 
+       static bool IsOverride(unsigned int userlevel, const std::string& modeline)
+       {
+               for (std::string::const_iterator i = modeline.begin(); i != modeline.end(); ++i)
+               {
+                       ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
+                       if (!mh)
+                               continue;
+
+                       if (mh->GetLevelRequired() > userlevel)
+                               return true;
+               }
+               return false;
+       }
+
  public:
 
-       ModuleOverride()
-                       {
+       void init()
+       {
                // read our config options (main config file)
                OnRehash(NULL);
                ServerInstance->SNO->EnableSnomask('v', "OVERRIDE");
                Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange };
-               ServerInstance->Modules->Attach(eventlist, this, 6);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        void OnRehash(User* user)
        {
-               // on a rehash we delete our classes for good measure and create them again.
-               ConfigReader Conf;
-
                // re-read our config options on a rehash
-               NoisyOverride = Conf.ReadFlag("override", "noisy", 0);
-               RequireKey = Conf.ReadFlag("override", "requirekey", 0);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("override");
+               NoisyOverride = tag->getBool("noisy");
+               RequireKey = tag->getBool("requirekey");
        }
 
        void On005Numeric(std::string &output)
@@ -74,7 +86,7 @@ class ModuleOverride : public Module
                {
                        if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetPrefixValue(source) < HALFOP_VALUE))
                        {
-                               ServerInstance->SNO->WriteGlobalSno('v',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
+                               ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to change a topic on "+channel->name);
                        }
 
                        // Explicit allow
@@ -91,7 +103,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 ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE))
                        {
-                               ServerInstance->SNO->WriteGlobalSno('v',std::string(source->nick)+" used oper override to kick "+std::string(memb->user->nick)+" on "+std::string(memb->chan->name)+" ("+reason+")");
+                               ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")");
                                return MOD_RES_ALLOW;
                        }
                }
@@ -107,9 +119,12 @@ class ModuleOverride : public Module
 
                unsigned int mode = channel->GetPrefixValue(source);
 
-               if (mode < HALFOP_VALUE && CanOverride(source, "MODE"))
+               if (!IsOverride(mode, parameters[1]))
+                       return MOD_RES_PASSTHRU;
+
+               if (CanOverride(source, "MODE"))
                {
-                       std::string msg = std::string(source->nick)+" overriding modes:";
+                       std::string msg = source->nick+" overriding modes:";
                        for(unsigned int i=0; i < parameters.size(); i++)
                                msg += " " + parameters[i];
                        ServerInstance->SNO->WriteGlobalSno('v',msg);
@@ -137,7 +152,7 @@ class ModuleOverride : public Module
                                                }
 
                                                if (NoisyOverride)
-                                                       chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str());
+                                                       chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str());
                                                ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +i on "+std::string(cname));
                                        }
                                        return MOD_RES_ALLOW;
@@ -153,12 +168,12 @@ class ModuleOverride : public Module
                                        }
 
                                        if (NoisyOverride)
-                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str());
+                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str());
                                        ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +k on "+std::string(cname));
                                        return MOD_RES_ALLOW;
                                }
 
-                               if (chan->IsModeSet('l') && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT")))
+                               if (chan->IsModeSet('l') && (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter('l'))) && (CanOverride(user,"LIMIT")))
                                {
                                        if (RequireKey && keygiven != "override")
                                        {
@@ -168,7 +183,7 @@ class ModuleOverride : public Module
                                        }
 
                                        if (NoisyOverride)
-                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str());
+                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str());
                                        ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +l on "+std::string(cname));
                                        return MOD_RES_ALLOW;
                                }
@@ -183,7 +198,7 @@ class ModuleOverride : public Module
                                        }
 
                                        if (NoisyOverride)
-                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
+                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
                                        ServerInstance->SNO->WriteGlobalSno('v',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
                                        return MOD_RES_ALLOW;
                                }