X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_kline.cpp;h=ce3642f91a70f8be66f7bd6a09c7e8357e7fe7b3;hb=8365be5414ae0f6d09724bd540db41ba24b2a7fd;hp=521159790603e1dc16d80d24f472cca015c339b8;hpb=4840d5e77572f42b710501912d59b5dbb6d2c2af;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp index 521159790..ce3642f91 100644 --- a/src/commands/cmd_kline.cpp +++ b/src/commands/cmd_kline.cpp @@ -1,82 +1,118 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" #include "xline.h" -#include "commands/cmd_kline.h" -extern "C" DllExport Command* init_command(InspIRCd* Instance) +/** Handle /KLINE. These command handlers can be reloaded by the core, + * and handle basic RFC1459 commands. Commands within modules work + * the same way, however, they can be fully unloaded, where these + * may not. + */ +class CommandKline : public Command { - return new CommandKline(Instance); -} + public: + /** Constructor for kline. + */ + CommandKline ( Module* parent) : Command(parent,"KLINE",1,3) { flags_needed = 'o'; Penalty = 0; syntax = " [ :]"; } + /** Handle command. + * @param parameters The parameters to the comamnd + * @param pcnt The number of parameters passed to teh command + * @param user The user issuing the command + * @return A value from CmdResult to indicate command success or failure. + */ + CmdResult Handle(const std::vector& parameters, User *user); +}; + /** Handle /KLINE */ -CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandKline::Handle (const std::vector& parameters, User *user) { - if (pcnt >= 3) + std::string target = parameters[0]; + + if (parameters.size() >= 3) { - IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]); + IdentHostPair ih; + User* find = ServerInstance->FindNick(target); + if ((find) && (find->registered == REG_ALL)) + { + ih.first = "*"; + ih.second = find->GetIPString(); + target = std::string("*@") + find->GetIPString(); + } + else + ih = ServerInstance->XLines->IdentSplit(target); + + if (ih.first.empty()) + { + user->WriteServ("NOTICE %s :*** Target not found", user->nick.c_str()); + return CMD_FAILURE; + } + if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user)) return CMD_FAILURE; - if (!strchr(parameters[0],'@')) - { - user->WriteServ("NOTICE %s :*** K-Line must contain a username, e.g. *@%s",user->nick,parameters[0]); - return CMD_FAILURE; - } - else if (strchr(parameters[0],'!')) + if (target.find('!') != std::string::npos) { - user->WriteServ("NOTICE %s :*** K-Line cannot contain a nickname!",user->nick); + user->WriteServ("NOTICE %s :*** K-Line cannot operate on nick!user@host masks",user->nick.c_str()); return CMD_FAILURE; } - long duration = ServerInstance->Duration(parameters[1]); - if (ServerInstance->XLines->add_kline(duration,user->nick,parameters[2],parameters[0])) + long duration = ServerInstance->Duration(parameters[1].c_str()); + 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)) { - FOREACH_MOD(I_OnAddKLine,OnAddKLine(duration, user, parameters[2], parameters[0])); - if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]); + 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(); - ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires on %s",user->nick,parameters[0], - ServerInstance->TimeString(c_requires_crap).c_str()); + std::string timestr = ServerInstance->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->XLines->apply_lines(); + ServerInstance->XLines->ApplyLines(); } else { - user->WriteServ("NOTICE %s :*** K-Line for %s already exists",user->nick,parameters[0]); + delete kl; + user->WriteServ("NOTICE %s :*** K-Line for %s already exists",user->nick.c_str(),target.c_str()); } } else { - if (ServerInstance->XLines->del_kline(parameters[0])) + if (ServerInstance->XLines->DelLine(target.c_str(),"K",user)) { - FOREACH_MOD(I_OnDelKLine,OnDelKLine(user, parameters[0])); - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s removed K-line on %s",user->nick.c_str(),target.c_str()); } else { - user->WriteServ("NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick.c_str(),target.c_str()); } } return CMD_SUCCESS; } +COMMAND_INIT(CommandKline)