* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#include "inspircd.h"
/* $ModDesc: Provides channel modes +a and +q */
+/* $ModDep: ../../include/u_listmode.h */
#define PROTECT_VALUE 40000
#define FOUNDER_VALUE 50000
int list;
int end;
char* dummyptr;
+ protected:
+ bool& remove_own_privs;
public:
- FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e) : MyInstance(Instance), extend(ext), type(mtype), list(l), end(e)
+ FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own) :
+ MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own)
{
}
{
unload_kludge = true;
CUList* cl = channel->GetUsers();
- std::string item = extend+std::string(channel->name);
- char moderemove[MAXBUF];
+ std::string item = extend + std::string(channel->name);
+ const char* mode_junk[MAXMODES+1];
userrec* n = new userrec(MyInstance);
n->SetFd(FD_MAGIC_NUMBER);
+ mode_junk[0] = channel->name;
+ irc::modestacker modestack(false);
+ std::deque<std::string> stackresult;
for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
{
if (i->second->GetExt(item, dummyptr))
{
- sprintf(moderemove,"-%c",mc);
- const char* parameters[] = { channel->name, moderemove, i->second->nick };
- MyInstance->SendMode(parameters, 3, n);
+ modestack.Push(mc, i->second->nick);
}
}
+
+ while (modestack.GetStackedLine(stackresult))
+ {
+ for (size_t j = 0; j < stackresult.size(); j++)
+ {
+ mode_junk[j+1] = stackresult[j].c_str();
+ }
+ MyInstance->SendMode(mode_junk, stackresult.size() + 1, n);
+ }
+
delete n;
unload_kludge = false;
}
{
char* dummyptr;
public:
- ChanFounder(InspIRCd* Instance, bool using_prefixes)
+ ChanFounder(InspIRCd* Instance, bool using_prefixes, bool &depriv_self)
: ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '~' : 0),
- FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387) { }
+ FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self) { }
unsigned int GetPrefixRank()
{
}
// source is a server, or ulined, we'll let them +-q the user.
- if ((unload_kludge) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (!IS_LOCAL(source)))
+ if ((unload_kludge) || ((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);
}
{
char* dummyptr;
public:
- ChanProtect(InspIRCd* Instance, bool using_prefixes)
+ ChanProtect(InspIRCd* Instance, bool using_prefixes, bool &depriv_self)
: ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '&' : 0),
- FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389) { }
+ FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self) { }
unsigned int GetPrefixRank()
{
std::string founder = "cm_founder_"+std::string(channel->name);
// source has +q, is a server, or ulined, we'll let them +-a the user.
- if ((unload_kludge) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!IS_LOCAL(source)))
+ 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)))
{
return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
}
bool FirstInGetsFounder;
bool QAPrefixes;
+ bool DeprivSelf;
+ bool booting;
ChanProtect* cp;
ChanFounder* cf;
char* dummyptr;
public:
- ModuleChanProtect(InspIRCd* Me) : Module::Module(Me)
+ ModuleChanProtect(InspIRCd* Me)
+ : Module::Module(Me), FirstInGetsFounder(false), QAPrefixes(false), DeprivSelf(false), booting(true)
{
/* Load config stuff */
- OnRehash("");
+ OnRehash(NULL,"");
+ booting = false;
/* Initialise module variables */
- cp = new ChanProtect(ServerInstance,QAPrefixes);
- cf = new ChanFounder(ServerInstance,QAPrefixes);
+ cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf);
+ cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf);
- ServerInstance->AddMode(cp, 'a');
- ServerInstance->AddMode(cf, 'q');
+ if (!ServerInstance->AddMode(cp, 'a') || !ServerInstance->AddMode(cf, 'q'))
+ throw ModuleException("Could not add new modes!");
}
void Implements(char* List)
user->Shrink("cm_protect_"+std::string(channel->name));
}
- virtual void OnRehash(const std::string ¶meter)
+ virtual void OnRehash(userrec* user, const std::string ¶meter)
{
/* Create a configreader class and read our flag,
* in old versions this was heap-allocated and the
* stack-allocate it locally.
*/
ConfigReader Conf(ServerInstance);
-
+
+ bool old_qa = QAPrefixes;
+
FirstInGetsFounder = Conf.ReadFlag("options","noservices",0);
QAPrefixes = Conf.ReadFlag("options","qaprefixes",0);
+ DeprivSelf = Conf.ReadFlag("options","deprotectself",0);
+
+ /* Did the user change the QA prefixes on the fly?
+ * If so, remove all instances of the mode, and reinit
+ * the module with prefixes enabled.
+ */
+ if ((old_qa != QAPrefixes) && (!booting))
+ {
+ ServerInstance->Modes->DelMode(cp);
+ ServerInstance->Modes->DelMode(cf);
+ DELETE(cp);
+ DELETE(cf);
+ cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf);
+ cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf);
+ /* These wont fail, we already owned the mode characters before */
+ ServerInstance->AddMode(cp, 'a');
+ ServerInstance->AddMode(cf, 'q');
+ ServerInstance->WriteOpers("*** WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change.");
+ }
}
virtual void OnUserJoin(userrec* user, chanrec* channel)
virtual Version GetVersion()
{
- return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
string_list commands;
std::string founder = "cm_founder_"+std::string(chan->name);
std::string protect = "cm_protect_"+std::string(chan->name);
+ irc::modestacker modestack(true);
+ std::deque<std::string> stackresult;
for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
{
if (i->second->GetExt(founder,dummyptr))
{
- proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(i->second->nick));
+ modestack.Push('q',i->second->nick);
}
if (i->second->GetExt(protect,dummyptr))
{
- proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(i->second->nick));
-
+ modestack.Push('a',i->second->nick);
}
}
+ while (modestack.GetStackedLine(stackresult))
+ {
+ irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1);
+ std::string line = mode_join.GetJoined();
+ proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan, line);
+ }
}
}