#define PROTECT_VALUE 40000
#define FOUNDER_VALUE 50000
-/* When this is set to true, no restrictions apply to setting or
- * removal of +qa. This is used while unloading so that the server
- * can freely clear all of its users of the modes.
- */
-bool unload_kludge = false;
-
/** Handles basic operation of +qa channel modes
*/
class FounderProtectBase
std::string type;
int list;
int end;
- char* dummyptr;
protected:
bool& remove_own_privs;
bool& remove_other_privs;
else
{
std::string item = extend+std::string(channel->name);
- if (x->GetExt(item,dummyptr))
+ if (x->GetExt(item))
{
return std::make_pair(true, x->nick);
}
return std::make_pair(false, parameter);
}
- void RemoveMode(Channel* channel, char mc)
+ void RemoveMode(Channel* channel, char mc, irc::modestacker* stack)
{
- unload_kludge = true;
CUList* cl = channel->GetUsers();
std::string item = extend + std::string(channel->name);
const char* mode_junk[MAXMODES+2];
for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
{
- if (i->first->GetExt(item, dummyptr))
+ if (i->first->GetExt(item))
{
- modestack.Push(mc, i->first->nick);
+ if (stack)
+ stack->Push(mc, i->first->nick);
+ else
+ modestack.Push(mc, i->first->nick);
}
}
+ if (stack)
+ return;
+
while (modestack.GetStackedLine(stackresult))
{
for (size_t j = 0; j < stackresult.size(); j++)
}
MyInstance->SendMode(mode_junk, stackresult.size() + 1, MyInstance->FakeClient);
}
-
- unload_kludge = false;
}
void DisplayList(User* user, Channel* channel)
std::string item = extend+std::string(channel->name);
for (CUList::reverse_iterator i = cl->rbegin(); i != cl->rend(); ++i)
{
- if (i->first->GetExt(item, dummyptr))
+ if (i->first->GetExt(item))
{
user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->first->nick);
}
bool CanRemoveOthers(User* u1, User* u2, Channel* c)
{
std::string item = extend+std::string(c->name);
- return (u1->GetExt(item, dummyptr) && u2->GetExt(item, dummyptr));
+ return (u1->GetExt(item) && u2->GetExt(item));
}
ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter)
if (adding)
{
- if (!theuser->GetExt(item, dummyptr))
+ if (!theuser->GetExt(item))
{
- theuser->Extend(item, "on");
+ theuser->Extend(item);
parameter = theuser->nick;
return MODEACTION_ALLOW;
}
}
else
{
- if (theuser->GetExt(item, dummyptr))
+ if (theuser->GetExt(item))
{
theuser->Shrink(item);
parameter = theuser->nick;
*/
class ChanFounder : public ModeHandler, public FounderProtectBase
{
- char* dummyptr;
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),
return FounderProtectBase::ModeSet(source, dest, channel, parameter);
}
- void RemoveMode(Channel* channel)
+ void RemoveMode(Channel* channel, irc::modestacker* stack)
{
- FounderProtectBase::RemoveMode(channel, this->GetModeChar());
+ FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack);
}
- void RemoveMode(User* user)
+ void RemoveMode(User* user, irc::modestacker* stack)
{
}
return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
}
// source is a server, or ulined, we'll let them +-q the user.
- if ((unload_kludge) || ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (!IS_LOCAL(source)))
+ if (source == ServerInstance->FakeClient ||
+ ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) ||
+ (ServerInstance->ULine(source->nick)) ||
+ (ServerInstance->ULine(source->server)) ||
+ (!*source->server) ||
+ (!IS_LOCAL(source)))
{
return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
}
*/
class ChanProtect : public ModeHandler, public FounderProtectBase
{
- char* dummyptr;
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),
return FounderProtectBase::ModeSet(source, dest, channel, parameter);
}
- void RemoveMode(Channel* channel)
+ void RemoveMode(Channel* channel, irc::modestacker* stack)
{
- FounderProtectBase::RemoveMode(channel, this->GetModeChar());
+ FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack);
}
- void RemoveMode(User* user)
+ void RemoveMode(User* user, irc::modestacker* stack)
{
}
return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
}
// source has +q, is a server, or ulined, we'll let them +-a the user.
- if ((unload_kludge) || ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!IS_LOCAL(source)))
+ if (source == ServerInstance->FakeClient ||
+ ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) ||
+ (ServerInstance->ULine(source->nick)) ||
+ (ServerInstance->ULine(source->server)) ||
+ (!*source->server) ||
+ (source->GetExt(founder)) ||
+ (!IS_LOCAL(source)))
{
return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
}
bool booting;
ChanProtect* cp;
ChanFounder* cf;
- char* dummyptr;
public:
{
// a user has been deopped. Do we let them? hmmm...
case AC_DEOP:
- if (dest->GetExt(founder,dummyptr))
+ if (dest->GetExt(founder))
{
source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder");
return ACR_DENY;
}
- if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
+ if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
{
source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)");
return ACR_DENY;
// a user is being kicked. do we chop off the end of the army boot?
case AC_KICK:
- if (dest->GetExt(founder,dummyptr))
+ if (dest->GetExt(founder))
{
source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder");
return ACR_DENY;
}
- if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
+ if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
{
source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)");
return ACR_DENY;
// a user is being dehalfopped. Yes, we do disallow -h of a +ha user
case AC_DEHALFOP:
- if (dest->GetExt(founder,dummyptr))
+ if (dest->GetExt(founder))
{
source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel founder");
return ACR_DENY;
}
- if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
+ if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
{
source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)");
return ACR_DENY;
// same with devoice.
case AC_DEVOICE:
- if (dest->GetExt(founder,dummyptr))
+ if (dest->GetExt(founder))
{
source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel founder");
return ACR_DENY;
}
- if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
+ if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
{
source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)");
return ACR_DENY;
projects / user / henk / code / inspircd.git / blobdiff