Fix iteration of oper blocks by SSLINFO

[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 c737be28631c005aaa5654e60d7e9d87d4556dd5..982f65853d50bc9ef27cefd5800a1e97f330a0ef 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -61,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())
                {
@@ -132,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")
                                                {
@@ -151,7 +151,7 @@ class ModuleOverride : public Module
                                        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,7 +166,7 @@ class ModuleOverride : public Module
                                        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")
                                        {
@@ -207,7 +207,7 @@ class ModuleOverride : public Module
 
        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);
        }
 };