: Command(parent, "ZLINE", 1, 3)
{
flags_needed = 'o';
- Penalty = 0;
syntax = "<ipmask> [<duration> :<reason>]";
}
-CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandZline::Handle(User* user, const Params& parameters)
{
std::string target = parameters[0];
{
if (target.find('!') != std::string::npos)
{
- user->WriteNotice("*** You cannot include a nickname in a zline, a zline must ban only an IP mask");
+ user->WriteNotice("*** You cannot include a nickname in a Z-line, a Z-line must ban only an IP mask.");
return CMD_FAILURE;
}
if (InsaneBan::MatchesEveryone(ipaddr, matcher, user, "Z", "ipmasks"))
return CMD_FAILURE;
- unsigned long duration = InspIRCd::Duration(parameters[1]);
+ unsigned long duration;
+ if (!InspIRCd::Duration(parameters[1], duration))
+ {
+ user->WriteNotice("*** Invalid duration for Z-line.");
+ return CMD_FAILURE;
+ }
ZLine* zl = new ZLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr);
if (ServerInstance->XLines->AddLine(zl,user))
{
else
{
delete zl;
- user->WriteNotice("*** Z-Line for " + std::string(ipaddr) + " already exists");
+ user->WriteNotice("*** Z-line for " + std::string(ipaddr) + " already exists.");
}
}
else
}
else
{
- user->WriteNotice("*** Z-Line " + target + " not found in list, try /stats Z.");
+ user->WriteNotice("*** Z-line " + target + " not found in list, try /stats Z.");
return CMD_FAILURE;
}
}
bool CommandZline::IPMatcher::Check(User* user, const std::string& ip) const
{
- return InspIRCd::Match(user->GetIPString(), ip, ascii_case_insensitive_map);
+ return InspIRCd::MatchCIDR(user->GetIPString(), ip, ascii_case_insensitive_map);
}