a.ReplaceFormat = MyConf.ReadValue("alias", "replace", i, true);
a.RequiredNick = MyConf.ReadValue("alias", "requires", i);
a.ULineOnly = MyConf.ReadFlag("alias", "uline", i);
- a.ChannelCommand = MyConf.ReadFlag("alias", "channelcommand", false, i);
- a.UserCommand = MyConf.ReadFlag("alias", "usercommand", true, i);
+ a.ChannelCommand = MyConf.ReadFlag("alias", "channelcommand", "no", i);
+ a.UserCommand = MyConf.ReadFlag("alias", "usercommand", "yes", i);
a.OperOnly = MyConf.ReadFlag("alias", "operonly", i);
a.format = MyConf.ReadValue("alias", "format", i);
a.CaseSensitive = MyConf.ReadFlag("alias", "matchcase", i);
while (i != Aliases.end())
{
if (i->second.UserCommand)
- DoAlias(user, NULL, &(i->second), compare, safe);
+ {
+ if (DoAlias(user, NULL, &(i->second), compare, safe))
+ {
+ return 1;
+ }
+ }
i++;
}
while (i != Aliases.end())
{
if (i->second.ChannelCommand)
- DoAlias(user, c, &(i->second), compare, safe);
+ {
+ if (DoAlias(user, c, &(i->second), compare, safe))
+ return 0;
+ }
i++;
}
}
- void DoAlias(User *user, Channel *c, Alias *a, const std::string compare, const std::string safe)
+ int DoAlias(User *user, Channel *c, Alias *a, const std::string compare, const std::string safe)
{
User *u = NULL;
+
/* Does it match the pattern? */
if (!a->format.empty())
{
if (a->CaseSensitive)
{
if (InspIRCd::Match(compare, a->format, case_sensitive_map))
- return;
+ return 0;
}
else
{
if (InspIRCd::Match(compare, a->format))
- return;
+ return 0;
}
}
if ((a->OperOnly) && (!IS_OPER(user)))
- return;
+ return 0;
if (!a->RequiredNick.empty())
{
if (!u)
{
user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
- return;
+ return 1;
}
}
if ((u != NULL) && (!a->RequiredNick.empty()) && (a->ULineOnly))
{
ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
- return;
+ return 1;
}
}
if (crlf == std::string::npos)
{
DoCommand(a->ReplaceFormat, user, c, safe);
- return;
+ return 1;
}
else
{
{
DoCommand(scommand, user, c, safe);
}
- return;
+ return 1;
}
}