X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=cf139f4a3d5dbe9032039dd18009e5ad872e3fff;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=d8fc89ccdc26f64c485928d697b8077621ccfff1;hpb=2307fd05b237b01e956e89de0a90613c6fdbfd78;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index d8fc89ccd..cf139f4a3 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -1,16 +1,27 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005, 2007 Robin Burchell + * Copyright (C) 2005-2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * 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 free but copyrighted software; see - * the file COPYING for details. + * 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" /* $ModDesc: Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel */ @@ -36,8 +47,6 @@ class RemoveBase : public Command CmdResult HandleRMB(const std::vector& parameters, User *user, bool neworder) { - const char* channame; - const char* username; User* target; Channel* channel; std::string reason; @@ -50,19 +59,22 @@ class RemoveBase : public Command * /remove [reason ...] * /fpart [reason ...] */ - channame = parameters[ neworder ? 0 : 1].c_str(); - username = parameters[ neworder ? 1 : 0].c_str(); + const std::string& channame = parameters[neworder ? 0 : 1]; + const std::string& username = parameters[neworder ? 1 : 0]; /* Look up the user we're meant to be removing from the channel */ - target = ServerInstance->FindNick(username); + if (IS_LOCAL(user)) + target = ServerInstance->FindNickOnly(username); + else + target = ServerInstance->FindNick(username); /* And the channel we're meant to be removing them from */ channel = ServerInstance->FindChan(channame); /* Fix by brain - someone needs to learn to validate their input! */ - if (!target || !channel) + if ((!target) || (target->registered != REG_ALL) || (!channel)) { - user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !target ? username : channame); + user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !channel ? channame.c_str() : username.c_str()); return CMD_FAILURE; } @@ -77,6 +89,12 @@ class RemoveBase : public Command hasnokicks = (ServerInstance->Modules->Find("m_nokicks.so") && channel->IsModeSet('Q')); + if (ServerInstance->ULine(target->server)) + { + user->WriteNumeric(482, "%s %s :Only a u-line may remove a u-line from a channel.", user->nick.c_str(), channame.c_str()); + return CMD_FAILURE; + } + /* We support the +Q channel mode via. the m_nokicks module, if the module is loaded and the mode is set then disallow the /remove */ if ((!IS_LOCAL(user)) || (!supportnokicks || !hasnokicks)) { @@ -87,27 +105,25 @@ class RemoveBase : public Command */ if ((!IS_LOCAL(user)) || ((ulevel > VOICE_VALUE) && (ulevel >= tlevel) && (tlevel != 50000))) { - // no you can't just go from a std::ostringstream to a std::string, Om. -nenolod - // but you can do this, nenolod -brain + // REMOVE/FPART will be sent to the target's server and it will reply with a PART (or do nothing if it doesn't understand the command) + if (!IS_LOCAL(target)) + return CMD_SUCCESS; - std::string reasonparam("No reason given"); + std::string reasonparam; /* If a reason is given, use it */ if(parameters.size() > 2) - { - /* Join params 2 ... pcnt - 1 (inclusive) into one */ - irc::stringjoiner reason_join(" ", parameters, 2, parameters.size() - 1); - reasonparam = reason_join.GetJoined(); - } + reasonparam = parameters[2]; + else + reasonparam = "No reason given"; /* Build up the part reason string. */ - reason = std::string("Removed by ") + user->nick + ": " + reasonparam; + reason = "Removed by " + user->nick + ": " + reasonparam; channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str()); target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick.c_str(), user->nick.c_str(), channel->name.c_str(), reasonparam.c_str()); - if (!channel->PartUser(target, reason)) - delete channel; + channel->PartUser(target, reason); } else { @@ -187,16 +203,19 @@ class ModuleRemove : public Module public: - ModuleRemove(InspIRCd*) : cmd1(this, supportnokicks), cmd2(this, supportnokicks) + ModuleRemove() : cmd1(this, supportnokicks), cmd2(this, supportnokicks) + { + } + + void init() { - ServerInstance->AddCommand(&cmd1); - ServerInstance->AddCommand(&cmd2); + ServerInstance->Modules->AddService(cmd1); + ServerInstance->Modules->AddService(cmd2); OnRehash(NULL); Implementation eventlist[] = { I_On005Numeric, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - virtual void On005Numeric(std::string &output) { output.append(" REMOVE"); @@ -204,8 +223,7 @@ class ModuleRemove : public Module virtual void OnRehash(User* user) { - ConfigReader conf(ServerInstance); - supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0); + supportnokicks = ServerInstance->Config->ConfValue("remove")->getBool("supportnokicks"); } virtual ~ModuleRemove() @@ -214,7 +232,7 @@ class ModuleRemove : public Module virtual Version GetVersion() { - return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION); + return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR); } };