* | 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 */
protected:
bool& remove_own_privs;
bool& remove_other_privs;
- bool& add_other_privs;
public:
- FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others, bool &add_others) :
- MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others), add_other_privs(add_others)
+ FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others) :
+ MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others)
{
}
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());
}
}
return (remove_other_privs && u1->GetExt(item) && u2->GetExt(item));
}
- bool CanAddOthers(User* u1, User* u2, Channel* c)
- {
- std::string item = extend+std::string(c->name);
- return (add_other_privs && u1->GetExt(item));
- }
-
ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter)
{
std::string item = extend+std::string(channel->name);
class ChanFounder : public ModeHandler, public FounderProtectBase
{
public:
- ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others, bool &priv_others)
- : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
- FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others, priv_others) { }
+ ChanFounder(InspIRCd* Instance, Module* Creator, char my_prefix, bool &depriv_self, bool &depriv_others)
+ : ModeHandler(Instance, Creator, '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()
{
{
}
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
{
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);
}
-
- // If they have it, allow them to give it.
- if (adding && FounderProtectBase::CanAddOthers(source, theuser, channel))
+ else
{
- return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
+ // whoops, someones being naughty!
+ source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q", source->nick.c_str(), channel->name.c_str());
+ parameter.clear();
+ return MODEACTION_DENY;
}
-
- // whoops, someones being naughty!
- source->WriteNumeric(468, "%s %s :You are not permitted to set additional founders", source->nick.c_str(), channel->name.c_str());
- parameter.clear();
- return MODEACTION_DENY;
}
void DisplayList(User* user, Channel* channel)
class ChanProtect : public ModeHandler, public FounderProtectBase
{
public:
- ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others, bool &priv_others)
- : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
- FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others, priv_others) { }
+ ChanProtect(InspIRCd* Instance, Module* Creator, char my_prefix, bool &depriv_self, bool &depriv_others)
+ : ModeHandler(Instance, Creator, '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()
{
{
}
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
std::string founder = "cm_founder_"+std::string(channel->name);
- if (!adding && FounderProtectBase::CanRemoveOthers(source, theuser, channel))
+ if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel))
{
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);
}
-
- // If they have it, allow them to give it.
- if (adding && FounderProtectBase::CanAddOthers(source, theuser, channel))
+ else
{
- return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
+ // bzzzt, wrong answer!
+ source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str());
+ return MODEACTION_DENY;
}
-
- // bzzzt, wrong answer!
- source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str());
- return MODEACTION_DENY;
}
virtual void DisplayList(User* user, Channel* channel)
char APrefix;
bool DeprivSelf;
bool DeprivOthers;
- bool PrivOthers;
bool booting;
ChanProtect* cp;
ChanFounder* cf;
/* Initialise module variables */
- cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers, PrivOthers);
- cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers, PrivOthers);
+ cp = new ChanProtect(ServerInstance, this, APrefix, DeprivSelf, DeprivOthers);
+ cf = new ChanFounder(ServerInstance, this, QPrefix, DeprivSelf, DeprivOthers);
if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf))
{
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)
DeprivSelf = Conf.ReadFlag("chanprotect","deprotectself", "yes", 0);
DeprivOthers = Conf.ReadFlag("chanprotect","deprotectothers", "yes", 0);
- DeprivOthers = Conf.ReadFlag("chanprotect","setprivsonothers", "yes", 0);
}
- virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
+ virtual ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
{
// if the user is the first user into the channel, mark them as the founder, but only if
// the config option for it is set
if (FirstInGetsFounder && !chan)
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());
+ return MOD_RES_PASSTHRU;
}
- virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
+ virtual ModResult 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
// etc of protected users. There are many types of access check, we're going to handle
// firstly, if a ulined nick, or a server, is setting the mode, then allow them to set the mode
// without any access checks, we're not worthy :p
if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
- return ACR_ALLOW;
+ return MOD_RES_ALLOW;
std::string founder("cm_founder_"+channel->name);
std::string protect("cm_protect_"+channel->name);
// Can do anything to yourself if deprotectself is enabled.
if (DeprivSelf && source == dest)
- return ACR_DEFAULT;
+ return MOD_RES_PASSTHRU;
bool candepriv_founder = (DeprivOthers && source->GetExt(founder));
bool candepriv_protected = (source->GetExt(founder) || (DeprivOthers && source->GetExt(protect))); // Can the source remove +a?
if (dest->GetExt(founder) && !candepriv_founder)
{
source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't deop "+dest->nick+" as they're a channel founder");
- return ACR_DENY;
+ return MOD_RES_DENY;
}
if ((dest->GetExt(protect)) && !candepriv_protected)
{
source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't deop "+dest->nick+" as they're protected (+a)");
- return ACR_DENY;
+ return MOD_RES_DENY;
}
break;
if (dest->GetExt(founder) && !candepriv_founder)
{
source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't kick "+dest->nick+" as they're a channel founder");
- return ACR_DENY;
+ return MOD_RES_DENY;
}
if ((dest->GetExt(protect)) && !candepriv_protected)
{
source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't kick "+dest->nick+" as they're protected (+a)");
- return ACR_DENY;
+ return MOD_RES_DENY;
}
break;
if (dest->GetExt(founder) && !candepriv_founder)
{
source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't de-halfop "+dest->nick+" as they're a channel founder");
- return ACR_DENY;
+ return MOD_RES_DENY;
}
if ((dest->GetExt(protect)) && !candepriv_protected)
{
source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't de-halfop "+dest->nick+" as they're protected (+a)");
- return ACR_DENY;
+ return MOD_RES_DENY;
}
break;
if (dest->GetExt(founder) && !candepriv_founder)
{
source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't devoice "+dest->nick+" as they're a channel founder");
- return ACR_DENY;
+ return MOD_RES_DENY;
}
if ((dest->GetExt(protect)) && !candepriv_protected)
{
source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't devoice "+dest->nick+" as they're protected (+a)");
- return ACR_DENY;
+ return MOD_RES_DENY;
}
break;
}
// we dont know what this access check is, or dont care. just carry on, nothing to see here.
- return ACR_DEFAULT;
+ return MOD_RES_PASSTHRU;
}
virtual ~ModuleChanProtect()
projects / user / henk / code / inspircd.git / blobdiff