: Command(parent, "KLINE", 1, 3)
{
flags_needed = 'o';
- Penalty = 0;
syntax = "<ident@host> [<duration> :<reason>]";
}
/** Handle /KLINE
*/
-CmdResult CommandKline::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandKline::Handle(User* user, const Params& parameters)
{
- std::string target = parameters[0];
+ std::string target = parameters[0];
if (parameters.size() >= 3)
{
else
ih = ServerInstance->XLines->IdentSplit(target);
- if (ih.first.empty())
- {
- user->WriteNotice("*** Target not found");
- return CMD_FAILURE;
- }
+ if (ih.first.empty())
+ {
+ user->WriteNotice("*** Target not found.");
+ return CMD_FAILURE;
+ }
InsaneBan::IPHostMatcher matcher;
if (InsaneBan::MatchesEveryone(ih.first+"@"+ih.second, matcher, user, "K", "hostmasks"))
if (target.find('!') != std::string::npos)
{
- user->WriteNotice("*** K-Line cannot operate on nick!user@host masks");
+ user->WriteNotice("*** K-line cannot operate on nick!user@host masks.");
return CMD_FAILURE;
}
- unsigned long duration = InspIRCd::Duration(parameters[1]);
+ unsigned long duration;
+ if (!InspIRCd::Duration(parameters[1], duration))
+ {
+ user->WriteNotice("*** Invalid duration for K-line.");
+ return CMD_FAILURE;
+ }
KLine* kl = new KLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
if (ServerInstance->XLines->AddLine(kl,user))
{
else
{
delete kl;
- user->WriteNotice("*** K-Line for " + target + " already exists");
+ user->WriteNotice("*** K-line for " + target + " already exists.");
}
}
else
}
else
{
- user->WriteNotice("*** K-Line " + target + " not found in list, try /stats k.");
+ user->WriteNotice("*** K-line " + target + " not found in list, try /stats k.");
}
}