X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_zline.cpp;h=cee7f616d5dfbd2f4467445a37bf813904f04696;hb=46a39046196f55b52336e19662bb7bac85b731ac;hp=a9f76a9328b286c1d6dcede0cf26411fae5d809e;hpb=59643d29385fd4fbfed7a5720e90e2c9ffd1fd21;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp index a9f76a932..cee7f616d 100644 --- a/src/commands/cmd_zline.cpp +++ b/src/commands/cmd_zline.cpp @@ -1,98 +1,114 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2009 Matt Smith + * 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_zline.h" - - - -extern "C" DllExport Command* init_command(InspIRCd* Instance) +/** Handle /ZLINE. 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 CommandZline : public Command { - return new CommandZline(Instance); -} + public: + /** Constructor for zline. + */ + CommandZline ( Module* parent) : Command(parent,"ZLINE",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); +}; -CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandZline::Handle (const std::vector& parameters, User *user) { - if (pcnt >= 3) + std::string target = parameters[0]; + + if (parameters.size() >= 3) { - if (strchr(parameters[0],'@') || strchr(parameters[0],'!')) + if (target.find('!') != std::string::npos) { - user->WriteServ("NOTICE %s :*** You cannot include a username or nickname in a zline, a zline must ban only an IP mask",user->nick); + user->WriteServ("NOTICE %s :*** You cannot include a nickname in a zline, a zline must ban only an IP mask",user->nick.c_str()); return CMD_FAILURE; } - User *u = ServerInstance->FindNick(parameters[0]); - + User *u = ServerInstance->FindNick(target.c_str()); + if (u) { - parameters[0] = u->GetIPString(); + target = u->GetIPString(); } - if (ServerInstance->IPMatchesEveryone(parameters[0],user)) - return CMD_FAILURE; - - long duration = ServerInstance->Duration(parameters[1]); + const char* ipaddr = target.c_str(); - const char* ipaddr = parameters[0]; - User* find = ServerInstance->FindNick(parameters[0]); - - if (find) - { - ipaddr = find->GetIPString(); - } - else + if (strchr(ipaddr,'@')) { - if (strchr(ipaddr,'@')) - { - while (*ipaddr != '@') - ipaddr++; + while (*ipaddr != '@') ipaddr++; - } + ipaddr++; } - ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr); + + if (ServerInstance->IPMatchesEveryone(ipaddr,user)) + return CMD_FAILURE; + + long duration = ServerInstance->Duration(parameters[1].c_str()); + + ZLine* zl = new ZLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr); if (ServerInstance->XLines->AddLine(zl,user)) { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s: %s", user->nick.c_str(), ipaddr, parameters[2].c_str()); } else { time_t c_requires_crap = duration + ServerInstance->Time(); - ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,parameters[0], - ServerInstance->TimeString(c_requires_crap).c_str()); + ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s: %s",user->nick.c_str(),ipaddr, + ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str()); } ServerInstance->XLines->ApplyLines(); } else { delete zl; - user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick.c_str(),ipaddr); } } else { - if (ServerInstance->XLines->DelLine(parameters[0],"Z",user)) + if (ServerInstance->XLines->DelLine(target.c_str(),"Z",user)) { - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s removed Z-line on %s",user->nick.c_str(),target.c_str()); } else { - user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick.c_str(),target.c_str()); return CMD_FAILURE; } } return CMD_SUCCESS; } + +COMMAND_INIT(CommandZline)