enum FilterFlags
{
- FLAG_NOOPERS = 1,
FLAG_PART = 2,
FLAG_QUIT = 4,
FLAG_PRIVMSG = 8,
bool FilterBase::AppliesToMe(userrec* user, FilterResult* filter, int flags)
{
- if ((flags & FLAG_NOOPERS) && (filter->flag_no_opers) && IS_OPER(user))
+ if ((filter->flag_no_opers) && IS_OPER(user))
return false;
if ((flags & FLAG_PRIVMSG) && (!filter->flag_privmsg))
return false;
command_t* c = ServerInstance->Parser->GetHandler(command);
if (c)
{
- const char* params[127];
+ const char* params[MAXPARAMETERS];
for (int item = 0; item < pcnt; item++)
params[item] = parameters[item];
params[replacepoint] = "Reason filtered";
/* Are they parting, if so, kill is applicable */
if ((parting) && (f->action == "kill"))
{
- user->SetWriteError("Filtered: "+f->reason);
- /* This WriteServ causes the write error to be applied.
- * Its not safe to kill here with QuitUser in a PreCommand handler,
- * so we do it this way, which is safe just about anywhere.
- */
user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick, f->reason.c_str());
+ userrec::QuitUser(ServerInstance, user, "Filtered: " + f->reason);
}
if (f->action == "gline")
{
std::ostringstream stream;
std::string x = filter->freeform;
+ /* Hax to allow spaces in the freeform without changing the design of the irc protocol */
for (std::string::iterator n = x.begin(); n != x.end(); n++)
if (*n == ' ')
*n = '\7';
- stream << x << " " << filter->action << " " << (filter->flags.empty() ? "-" : filter->flags) << " " << filter->gline_time << " " << filter->reason;
+ stream << x << " " << filter->action << " " << (filter->flags.empty() ? "-" : filter->flags) << " " << filter->gline_time << " :" << filter->reason;
return stream.str();
}
FilterResult FilterBase::DecodeFilter(const std::string &data)
{
FilterResult res;
- std::istringstream stream(data);
-
- stream >> res.freeform;
- stream >> res.action;
- stream >> res.flags;
+ irc::tokenstream tokens(data);
+ tokens.GetToken(res.freeform);
+ tokens.GetToken(res.action);
+ tokens.GetToken(res.flags);
if (res.flags == "-")
res.flags = "";
res.FillFlags(res.flags);
- stream >> res.gline_time;
- res.reason = stream.str();
+ tokens.GetToken(res.gline_time);
+ tokens.GetToken(res.reason);
+ /* Hax to allow spaces in the freeform without changing the design of the irc protocol */
for (std::string::iterator n = res.freeform.begin(); n != res.freeform.end(); n++)
if (*n == '\7')
*n = ' ';