Weed out a few leftover server instances from before modules had ServerInstance....

[user/henk/code/inspircd.git] / src / modules / m_chanprotect.cpp

diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 87f5756a92ca18c7b71b8191c4d52b5c340f987a..ca331b0cf9170bab9a9ef2fe521a687e70ac6468 100644 (file)
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,6 +12,7 @@
  */
 
 #include "inspircd.h"
+#include "m_override.h"
 
 /* $ModDesc: Provides channel modes +a and +q */
 
@@ -158,7 +159,7 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
 {
  public:
        ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others)
-               : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
+               : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0, TR_NICK),
                  FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others) { }
 
        unsigned int GetPrefixRank()
@@ -193,13 +194,23 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
                {
                        return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
                }
+
+               char isoverride=0;
+               Module *Override = ServerInstance->Modules->FindFeature("Override");
+               if (Override)
+               {
+                       OVRrequest ovr(NULL,Override,source,"OTHERMODE");
+                       const char * tmp = ovr.Send();
+                       isoverride = tmp[0];
+               }
                 // source is a server, or ulined, we'll let them +-q the user.
                if (source == ServerInstance->FakeClient ||
                                ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) ||
                                (ServerInstance->ULine(source->nick.c_str())) ||
                                (ServerInstance->ULine(source->server)) ||
                                (!*source->server) ||
-                               (!IS_LOCAL(source)))
+                               (!IS_LOCAL(source)) ||
+                               isoverride)
                {
                        return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
                }
@@ -224,7 +235,7 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
 {
  public:
        ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others)
-               : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
+               : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0, TR_NICK),
                  FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others) { }
 
        unsigned int GetPrefixRank()
@@ -259,6 +270,15 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
                {
                        return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
                }
+
+               char isoverride=0;
+               Module *Override = ServerInstance->Modules->FindFeature("Override");
+               if (Override)
+               {
+                       OVRrequest ovr(NULL,Override,source,"OTHERMODE");
+                       const char * tmp = ovr.Send();
+                       isoverride = tmp[0];
+               }
                // source has +q, is a server, or ulined, we'll let them +-a the user.
                if (source == ServerInstance->FakeClient ||
                        ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) ||
@@ -266,7 +286,9 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
                        (ServerInstance->ULine(source->server)) ||
                        (!*source->server) ||
                        (source->GetExt(founder)) ||
-                       (!IS_LOCAL(source)))
+                       (!IS_LOCAL(source)) ||
+                       isoverride
+                       )
                {
                        return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
                }