: Command(parent, "KLINE", 1, 3)
{
flags_needed = 'o';
- syntax = "<ident@host> [<duration> :<reason>]";
+ syntax = "<user@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];
if (ih.first.empty())
{
- user->WriteNotice("*** Target not found");
+ user->WriteNotice("*** Target not found.");
return CMD_FAILURE;
}
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))
{
if (!duration)
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s: %s",user->nick.c_str(),target.c_str(), parameters[2].c_str());
+ ServerInstance->SNO->WriteToSnoMask('x', "%s added permanent K-line for %s: %s", user->nick.c_str(), target.c_str(), parameters[2].c_str());
}
else
{
- time_t c_requires_crap = duration + ServerInstance->Time();
- std::string timestr = InspIRCd::TimeString(c_requires_crap);
- ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
- timestr.c_str(), parameters[2].c_str());
+ ServerInstance->SNO->WriteToSnoMask('x', "%s added timed K-line for %s, expires in %s (on %s): %s",
+ user->nick.c_str(), target.c_str(), InspIRCd::DurationString(duration).c_str(),
+ InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str());
}
ServerInstance->XLines->ApplyLines();
else
{
delete kl;
- user->WriteNotice("*** K-Line for " + target + " already exists");
+ user->WriteNotice("*** K-line for " + target + " already exists.");
}
}
else
{
- if (ServerInstance->XLines->DelLine(target.c_str(),"K",user))
+ std::string reason;
+
+ if (ServerInstance->XLines->DelLine(target.c_str(), "K", reason, user))
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s removed K-line on %s",user->nick.c_str(),target.c_str());
+ ServerInstance->SNO->WriteToSnoMask('x', "%s removed K-line on %s: %s", user->nick.c_str(), target.c_str(), reason.c_str());
}
else
{
- user->WriteNotice("*** K-Line " + target + " not found in list, try /stats k.");
+ user->WriteNotice("*** K-line " + target + " not found on the list.");
}
}