{
CUList* cl = channel->GetUsers();
std::string item = extend + std::string(channel->name);
- const char* mode_junk[MAXMODES+2];
- mode_junk[0] = channel->name;
- irc::modestacker modestack(false);
- std::deque<std::string> stackresult;
+ std::vector<std::string> mode_junk;
+ mode_junk.push_back(channel->name);
+ irc::modestacker modestack(MyInstance, false);
+ std::deque<std::string> stackresult;
for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
{
{
for (size_t j = 0; j < stackresult.size(); j++)
{
- mode_junk[j+1] = stackresult[j].c_str();
+ mode_junk.push_back(stackresult[j]);
}
- MyInstance->SendMode(mode_junk, stackresult.size() + 1, MyInstance->FakeClient);
+ MyInstance->SendMode(mode_junk, MyInstance->FakeClient);
}
}
{
if (i->first->GetExt(item))
{
- user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->first->nick);
+ user->WriteServ("%d %s %s %s", list, user->nick.c_str(), channel->name.c_str(), i->first->nick.c_str());
}
}
- user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str());
+ user->WriteServ("%d %s %s :End of channel %s list", end, user->nick.c_str(), channel->name.c_str(), type.c_str());
}
User* FindAndVerify(std::string ¶meter, Channel* channel)
bool CanRemoveOthers(User* u1, User* u2, Channel* c)
{
std::string item = extend+std::string(c->name);
- return (u1->GetExt(item) && u2->GetExt(item));
+ return (remove_other_privs && u1->GetExt(item) && u2->GetExt(item));
}
ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter)
// 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)) ||
+ (ServerInstance->ULine(source->nick.c_str())) ||
(ServerInstance->ULine(source->server)) ||
(!*source->server) ||
(!IS_LOCAL(source)))
else
{
// whoops, someones being naughty!
- source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q",source->nick, channel->name);
+ 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;
}
}
// 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->nick)) ||
+ ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) ||
+ (ServerInstance->ULine(source->nick.c_str())) ||
(ServerInstance->ULine(source->server)) ||
(!*source->server) ||
(source->GetExt(founder)) ||
else
{
// bzzzt, wrong answer!
- source->WriteNumeric(482, "%s %s :You are not a channel founder",source->nick, channel->name);
+ source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str());
return MODEACTION_DENY;
}
}
class ModuleChanProtect : public Module
{
-
+
bool FirstInGetsFounder;
char QPrefix;
char APrefix;
bool booting;
ChanProtect* cp;
ChanFounder* cf;
-
+
public:
-
+
ModuleChanProtect(InspIRCd* Me)
: Module(Me), FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true), cp(NULL), cf(NULL)
{
/* Load config stuff */
- OnRehash(NULL,"");
+ LoadSettings();
booting = false;
/* Initialise module variables */
throw ModuleException("Could not add new modes!");
}
- Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnRehash, I_OnUserPreJoin, I_OnPostJoin, I_OnAccessCheck };
- ServerInstance->Modules->Attach(eventlist, this, 6);
+ Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnUserPreJoin, I_OnPostJoin, I_OnAccessCheck };
+ ServerInstance->Modules->Attach(eventlist, this, 5);
}
virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
user->Shrink("cm_protect_"+std::string(chan->name));
}
- virtual void OnUserPart(User* user, Channel* channel, const std::string &partreason, bool &silent)
+ virtual void OnUserPart(User* user, Channel* channel, std::string &partreason, bool &silent)
{
// FIX: when someone parts a channel we must remove their Extensibles!
user->Shrink("cm_founder_"+std::string(channel->name));
user->Shrink("cm_protect_"+std::string(channel->name));
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ void LoadSettings()
{
/* Create a configreader class and read our flag,
* in old versions this was heap-allocated and the
*/
ConfigReader Conf(ServerInstance);
- char old_q = QPrefix;
- char old_a = APrefix;
-
FirstInGetsFounder = Conf.ReadFlag("options", "noservices", 0);
std::string qpre = Conf.ReadValue("options", "qprefix", 0);
APrefix = apre.empty() ? 0 : apre[0];
if ((APrefix && QPrefix) && APrefix == QPrefix)
- throw CoreException("What the smeg, why are both your +q and +a prefixes the same character?");
+ throw ModuleException("What the smeg, why are both your +q and +a prefixes the same character?");
if (cp && ServerInstance->Modes->FindPrefix(APrefix) == cp)
- throw CoreException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another.");
+ throw ModuleException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another.");
- if (cf && ServerInstance->Modes->FindPrefix(APrefix) == cf)
- throw CoreException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another.");
+ 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);
-
- ServerInstance->Logs->Log("chanprotect", DEBUG, "qprefix is %c and aprefix is %c", QPrefix, APrefix);
-
- /* 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_q != QPrefix) && (!booting))
- {
- ServerInstance->Modes->DelMode(cf);
- delete cf;
- cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers);
- /* These wont fail, we already owned the mode characters before */
- ServerInstance->Modes->AddMode(cf);
- ServerInstance->SNO->WriteToSnoMask('A', "WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change.");
- }
-
- if ((old_a != APrefix) && (!booting))
- {
- ServerInstance->Modes->DelMode(cp);
- delete cp;
- cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers);
- ServerInstance->Modes->AddMode(cp);
- ServerInstance->SNO->WriteToSnoMask('A', "WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change.");
- }
}
-
- virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs)
+
+ virtual int 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 = 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, user->nick);
+ 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
// a relatively small number of them relevent to our module using a switch statement.
// don't allow action if:
// (A) Theyre founder (no matter what)
- // (B) Theyre protected, and you're not
+ // (B) Theyre protected, unless you're founder or are protected and DeprivOthers is enabled
// always allow the action if:
// (A) The source is ulined
-
-
+
// 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)) || (ServerInstance->ULine(source->server)) || (!*source->server))
+ if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
return ACR_ALLOW;
- std::string founder = "cm_founder_"+std::string(channel->name);
- std::string protect = "cm_protect_"+std::string(channel->name);
+ 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;
+
+ bool candepriv_founder = (DeprivOthers && source->GetExt(founder));
+ bool candepriv_protected = (source->GetExt(founder) || (DeprivOthers && source->GetExt(protect))); // Can the source remove +a?
switch (access_type)
{
// a user has been deopped. Do we let them? hmmm...
case AC_DEOP:
- if (dest->GetExt(founder))
+ if (dest->GetExt(founder) && !candepriv_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");
+ source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't deop "+dest->nick+" as they're a channel founder");
return ACR_DENY;
}
- if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
+ if ((dest->GetExt(protect)) && !candepriv_protected)
{
- source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)");
+ source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't deop "+dest->nick+" as they're protected (+a)");
return ACR_DENY;
}
break;
// a user is being kicked. do we chop off the end of the army boot?
case AC_KICK:
- if (dest->GetExt(founder))
+ if (dest->GetExt(founder) && !candepriv_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");
+ source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't kick "+dest->nick+" as they're a channel founder");
return ACR_DENY;
}
- if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
+ if ((dest->GetExt(protect)) && !candepriv_protected)
{
- source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)");
+ source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't kick "+dest->nick+" as they're protected (+a)");
return ACR_DENY;
}
break;
// a user is being dehalfopped. Yes, we do disallow -h of a +ha user
case AC_DEHALFOP:
- if (dest->GetExt(founder))
+ if (dest->GetExt(founder) && !candepriv_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");
+ source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't de-halfop "+dest->nick+" as they're a channel founder");
return ACR_DENY;
}
- if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
+ if ((dest->GetExt(protect)) && !candepriv_protected)
{
- source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)");
+ source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't de-halfop "+dest->nick+" as they're protected (+a)");
return ACR_DENY;
}
break;
// same with devoice.
case AC_DEVOICE:
- if (dest->GetExt(founder))
+ if (dest->GetExt(founder) && !candepriv_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");
+ source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't devoice "+dest->nick+" as they're a channel founder");
return ACR_DENY;
}
- if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
+ if ((dest->GetExt(protect)) && !candepriv_protected)
{
- source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)");
+ source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't devoice "+dest->nick+" as they're protected (+a)");
return ACR_DENY;
}
break;
}
-
+
// we dont know what this access check is, or dont care. just carry on, nothing to see here.
return ACR_DEFAULT;
}
-
+
virtual ~ModuleChanProtect()
{
ServerInstance->Modes->DelMode(cp);
delete cp;
delete cf;
}
-
+
virtual Version GetVersion()
{
return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
projects / user / henk / code / inspircd.git / blobdiff