Maxpara on these was 3, should be 2

[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 a1107b6ce031afe5dc249909d873a93ed5e085a5..85c8660a25c8ecced6d663f3c23d16a0bc20ab27 100644 (file)
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,6 +12,7 @@
  */
 
 #include "inspircd.h"
+#include "m_override.h"
 
 /* $ModDesc: Provides channel modes +a and +q */
 
@@ -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);
                }
@@ -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);
                }
@@ -338,19 +360,14 @@ class ModuleChanProtect : public Module
 
        void LoadSettings()
        {
-               /* Create a configreader class and read our flag,
-                * in old versions this was heap-allocated and the
-                * object was kept between rehashes...now we just
-                * stack-allocate it locally.
-                */
                ConfigReader Conf(ServerInstance);
 
-               FirstInGetsFounder = Conf.ReadFlag("options", "noservices", 0);
+               FirstInGetsFounder = Conf.ReadFlag("chanprotect", "noservices", 0);
 
-               std::string qpre = Conf.ReadValue("options", "qprefix", 0);
+               std::string qpre = Conf.ReadValue("chanprotect", "qprefix", 0);
                QPrefix = qpre.empty() ? 0 : qpre[0];
 
-               std::string apre = Conf.ReadValue("options", "aprefix", 0);
+               std::string apre = Conf.ReadValue("chanprotect", "aprefix", 0);
                APrefix = apre.empty() ? 0 : apre[0];
 
                if ((APrefix && QPrefix) && APrefix == QPrefix)
@@ -362,8 +379,8 @@ class ModuleChanProtect : public Module
                if (cf && ServerInstance->Modes->FindPrefix(QPrefix) == cf)
                        throw ModuleException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another.");
 
-               DeprivSelf = Conf.ReadFlag("options","deprotectself",0);
-               DeprivOthers = Conf.ReadFlag("options","deprotectothers",0);
+               DeprivSelf = Conf.ReadFlag("chanprotect","deprotectself", "yes", 0);
+               DeprivOthers = Conf.ReadFlag("chanprotect","deprotectothers", "yes", 0);
        }
 
        virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)