diff options
Diffstat (limited to 'src/commands/cmd_qline.cpp')
| -rw-r--r-- | src/commands/cmd_qline.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/commands/cmd_qline.cpp b/src/commands/cmd_qline.cpp index 97d26ba9f..f3471a6b3 100644 --- a/src/commands/cmd_qline.cpp +++ b/src/commands/cmd_qline.cpp @@ -22,31 +22,31 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandQline(Instance); } -CmdResult CommandQline::Handle (const char* const* parameters, int pcnt, User *user) +CmdResult CommandQline::Handle (const std::vector<std::string>& parameters, User *user) { - if (pcnt >= 3) + if (parameters.size() >= 3) { if (ServerInstance->NickMatchesEveryone(parameters[0],user)) return CMD_FAILURE; - if (strchr(parameters[0],'@') || strchr(parameters[0],'!') || strchr(parameters[0],'.')) + if (parameters[0].find('@') != std::string::npos || parameters[0].find('!') != std::string::npos || parameters[0].find('.') != std::string::npos) { user->WriteServ("NOTICE %s :*** A Q-Line only bans a nick pattern, not a nick!user@host pattern.",user->nick); return CMD_FAILURE; } - long duration = ServerInstance->Duration(parameters[1]); - QLine* ql = new QLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]); + long duration = ServerInstance->Duration(parameters[1].c_str()); + QLine* ql = new QLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), parameters[0].c_str()); if (ServerInstance->XLines->AddLine(ql,user)) { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0].c_str()); } else { time_t c_requires_crap = duration + ServerInstance->Time(); - ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires on %s",user->nick,parameters[0], + ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires on %s",user->nick,parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str()); } ServerInstance->XLines->ApplyLines(); @@ -54,18 +54,18 @@ CmdResult CommandQline::Handle (const char* const* parameters, int pcnt, User *u else { delete ql; - user->WriteServ("NOTICE %s :*** Q-Line for %s already exists",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** Q-Line for %s already exists",user->nick,parameters[0].c_str()); } } else { - if (ServerInstance->XLines->DelLine(parameters[0],"Q",user)) + if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "Q", user)) { - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Q-line on %s.",user->nick,parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Q-line on %s.",user->nick,parameters[0].c_str()); } else { - user->WriteServ("NOTICE %s :*** Q-Line %s not found in list, try /stats q.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** Q-Line %s not found in list, try /stats q.",user->nick,parameters[0].c_str()); return CMD_FAILURE; } } |