* | 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.
*/
#include "inspircd.h"
+#include "m_override.h"
/* $ModDesc: Provides channel modes +a and +q */
while (modestack.GetStackedLine(stackresult))
{
- for (size_t j = 0; j < stackresult.size(); j++)
- {
- mode_junk.push_back(stackresult[j]);
- }
+ mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
MyInstance->SendMode(mode_junk, MyInstance->FakeClient);
+ mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
}
}
{
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()
{
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);
}
{
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()
{
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);
}
throw ModuleException("Could not add new modes!");
}
- Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnUserPreJoin, I_OnPostJoin, I_OnAccessCheck };
- ServerInstance->Modules->Attach(eventlist, this, 5);
+ Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnUserPreJoin, I_OnAccessCheck };
+ ServerInstance->Modules->Attach(eventlist, this, 4);
}
virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
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;
}
- virtual void OnPostJoin(User *user, Channel *channel)
- {
- // This *must* be in PostJoin, not UserJoin - the former will make it appear to happen
- // before the client is in the channel
-
- // This notice was here originally because it was all done prior to the creation of
- // privs in OnUserPreJoin. I've left it because it might still be wanted, but i'm
- // not sure it really should be here - ops don't get shown, obviously, and the prefix
- // will appear in the names list for the user.. remove if desired -Special
-
- if (FirstInGetsFounder && channel->GetUserCounter() == 1)
- user->WriteServ("MODE %s +q %s", channel->name.c_str(), user->nick.c_str());
- }
-
virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
{
// here we perform access checks, this is the important bit that actually stops kicking/deopping
virtual Version GetVersion()
{
- return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
};