X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=1ba51a0eb411da85b08ffdf7bec1c4f464654d3d;hb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;hp=d17deb742fb82b96e677f9a55f2503c99feb2dd0;hpb=91df762e93212958db487d8517addba1a63a4ddd;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index d17deb742..1ba51a0eb 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 */ @@ -29,15 +40,13 @@ class RemoveBase : public Command bool& supportnokicks; public: - RemoveBase(InspIRCd* Instance, Module* Creator, bool& snk, const char* cmdn, const char* a, int b, int c, bool d, int e) - : Command(Instance, Creator, cmdn, a,b,c,d,e), supportnokicks(snk) + RemoveBase(Module* Creator, bool& snk, const char* cmdn) + : Command(Creator, cmdn, 2, 3), supportnokicks(snk) { } CmdResult HandleRMB(const std::vector& parameters, User *user, bool neworder) { - const char* channame; - const char* username; User* target; Channel* channel; std::string reason; @@ -50,8 +59,8 @@ 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); @@ -62,7 +71,7 @@ class RemoveBase : public Command /* Fix by brain - someone needs to learn to validate their input! */ if (!target || !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(), !target ? username.c_str() : channame.c_str()); return CMD_FAILURE; } @@ -77,6 +86,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 +102,21 @@ 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 - - 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 { @@ -132,8 +141,8 @@ class RemoveBase : public Command class CommandRemove : public RemoveBase { public: - CommandRemove(InspIRCd* Instance, Module* Creator, bool& snk) - : RemoveBase(Instance, Creator, snk, "REMOVE", 0, 2, 2, false, 0) + CommandRemove(Module* Creator, bool& snk) + : RemoveBase(Creator, snk, "REMOVE") { syntax = " []"; TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END); @@ -158,8 +167,8 @@ class CommandRemove : public RemoveBase class CommandFpart : public RemoveBase { public: - CommandFpart(InspIRCd* Instance, Module* Creator, bool& snk) - : RemoveBase(Instance, Creator, snk, "FPART", 0, 2, 2, false, 0) + CommandFpart(Module* Creator, bool& snk) + : RemoveBase(Creator, snk, "FPART") { syntax = " []"; TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END); @@ -187,8 +196,11 @@ class ModuleRemove : public Module public: - ModuleRemove(InspIRCd* Me) - : Module(Me), cmd1(Me, this, supportnokicks), cmd2(Me, this, supportnokicks) + ModuleRemove() : cmd1(this, supportnokicks), cmd2(this, supportnokicks) + { + } + + void init() { ServerInstance->AddCommand(&cmd1); ServerInstance->AddCommand(&cmd2); @@ -197,7 +209,6 @@ class ModuleRemove : public Module ServerInstance->Modules->Attach(eventlist, this, 2); } - virtual void On005Numeric(std::string &output) { output.append(" REMOVE"); @@ -205,8 +216,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() @@ -215,7 +225,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); } };