m_spanningtree Remove remains of the KeepNickTS workaround

[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 1bc05a4ef1f6343f9e30989c067a63b0bb241349..346d38b9f32b68518898689746f223e67a148a55 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -30,21 +30,42 @@ class ModuleOverride : public Module
 {
        bool RequireKey;
        bool NoisyOverride;
+       ChanModeReference topiclock;
+       ChanModeReference inviteonly;
+       ChanModeReference key;
+       ChanModeReference limit;
+
+       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()
+               : topiclock(this, "topiclock")
+               , inviteonly(this, "inviteonly")
+               , key(this, "key")
+               , limit(this, "limit")
+       {
+       }
 
        void init() CXX11_OVERRIDE
        {
-               // 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, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               // re-read our config options on a rehash
+               // re-read our config options
                ConfigTag* tag = ServerInstance->Config->ConfValue("override");
                NoisyOverride = tag->getBool("noisy");
                RequireKey = tag->getBool("requirekey");
@@ -68,7 +89,7 @@ class ModuleOverride : public Module
        {
                if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC"))
                {
-                       if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetPrefixValue(source) < HALFOP_VALUE))
+                       if (!channel->HasUser(source) || (channel->IsModeSet(topiclock) && channel->GetPrefixValue(source) < HALFOP_VALUE))
                        {
                                ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to change a topic on "+channel->name);
                        }
@@ -96,14 +117,17 @@ class ModuleOverride : public Module
 
        ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
        {
-               if (!source || !channel)
+               if (!channel)
                        return MOD_RES_PASSTHRU;
                if (!source->IsOper() || !IS_LOCAL(source))
                        return MOD_RES_PASSTHRU;
 
                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 = source->nick+" overriding modes:";
                        for(unsigned int i=0; i < parameters.size(); i++)
@@ -120,7 +144,7 @@ class ModuleOverride : public Module
                {
                        if (chan)
                        {
-                               if (chan->IsModeSet('i') && (CanOverride(user,"INVITE")))
+                               if (chan->IsModeSet(inviteonly) && (CanOverride(user,"INVITE")))
                                {
                                        if (!IS_LOCAL(user)->IsInvited(chan))
                                        {
@@ -138,7 +162,7 @@ class ModuleOverride : public Module
                                        return MOD_RES_ALLOW;
                                }
 
-                               if (chan->IsModeSet('k') && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k'))
+                               if (chan->IsModeSet(key) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter(key))
                                {
                                        if (RequireKey && keygiven != "override")
                                        {
@@ -153,7 +177,7 @@ class ModuleOverride : public Module
                                        return MOD_RES_ALLOW;
                                }
 
-                               if (chan->IsModeSet('l') && (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter('l'))) && (CanOverride(user,"LIMIT")))
+                               if (chan->IsModeSet(limit) && (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter(limit))) && (CanOverride(user,"LIMIT")))
                                {
                                        if (RequireKey && keygiven != "override")
                                        {