* | 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
*/
#include "inspircd.h"
+#include "m_override.h"
/* $ModDesc: Provides channel modes +a and +q */
{
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);
}
{
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)) ||
(ServerInstance->ULine(source->server)) ||
(!*source->server) ||
(source->GetExt(founder)) ||
- (!IS_LOCAL(source)))
+ (!IS_LOCAL(source)) ||
+ isoverride
+ )
{
return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
}
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)
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)
// the config option for it is set
if (FirstInGetsFounder && !chan)
- privs = QPrefix + "@";
+ privs = std::string(1, QPrefix) + "@";
return 0;
}