Remove spanningtree override of /LUSERS

[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 3c45bb37db64cb35e1ce566277c2eafffea10504..d931891c2e67a1ad86e578e6224da831cdd303fe 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "m_override.h"
 
 /* $ModDesc: Provides support for unreal-style oper-override */
 
@@ -31,12 +30,8 @@ class ModuleOverride : public Module
                // read our config options (main config file)
                OnRehash(NULL);
                ServerInstance->SNO->EnableSnomask('G', "GODMODE");
-               if (!ServerInstance->Modules->PublishFeature("Override", this))
-               {
-                       throw ModuleException("m_override: Unable to publish feature 'Override'");
-               }
-               Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange, I_OnRequest };
-               ServerInstance->Modules->Attach(eventlist, this, 7);
+               Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange };
+               ServerInstance->Modules->Attach(eventlist, this, 6);
        }
 
        void OnRehash(User* user)
@@ -66,7 +61,7 @@ class ModuleOverride : public Module
        bool CanOverride(User* source, const char* token)
        {
                // checks to see if the oper's type has <type:override>
-               override_t::iterator j = overrides.find(source->oper);
+               override_t::iterator j = overrides.find(source->oper->name);
 
                if (j != overrides.end())
                {
@@ -137,10 +132,10 @@ class ModuleOverride : public Module
                {
                        if (chan)
                        {
-                               if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE")))
+                               if (chan->IsModeSet('i') && (CanOverride(user,"INVITE")))
                                {
                                        irc::string x(chan->name.c_str());
-                                       if (!user->IsInvited(x))
+                                       if (!IS_LOCAL(user)->IsInvited(x))
                                        {
                                                if (RequireKey && keygiven != "override")
                                                {
@@ -150,13 +145,13 @@ 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());
+                                                       chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str());
                                                ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
                                        }
                                        return MOD_RES_ALLOW;
                                }
 
-                               if ((chan->modes[CM_KEY]) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k'))
+                               if (chan->IsModeSet('k') && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k'))
                                {
                                        if (RequireKey && keygiven != "override")
                                        {
@@ -166,12 +161,12 @@ 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());
+                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str());
                                        ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
                                        return MOD_RES_ALLOW;
                                }
 
-                               if ((chan->modes[CM_LIMIT]) && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT")))
+                               if (chan->IsModeSet('l') && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT")))
                                {
                                        if (RequireKey && keygiven != "override")
                                        {
@@ -181,7 +176,7 @@ 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());
+                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str());
                                        ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
                                        return MOD_RES_ALLOW;
                                }
@@ -196,7 +191,7 @@ class ModuleOverride : public Module
                                        }
 
                                        if (NoisyOverride)
-                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
+                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
                                        ServerInstance->SNO->WriteGlobalSno('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
                                        return MOD_RES_ALLOW;
                                }
@@ -205,25 +200,14 @@ class ModuleOverride : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       const char* OnRequest(Request* request)
-       {
-               if(strcmp(OVRREQID, request->GetId()) == 0)
-               {
-                       OVRrequest* req = static_cast<OVRrequest*>(request);
-                       return this->CanOverride(req->requser,req->reqtoken.c_str()) ? "yes":"";
-               }
-               return NULL;
-       }
-
        ~ModuleOverride()
        {
-               ServerInstance->Modules->UnpublishFeature("Override");
                ServerInstance->SNO->DisableSnomask('G');
        }
 
        Version GetVersion()
        {
-               return Version("Provides support for unreal-style oper-override",VF_VENDOR,API_VERSION);
+               return Version("Provides support for unreal-style oper-override",VF_VENDOR);
        }
 };