-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2005-2006 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
/* $ModDesc: Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel */
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)
{
}
hasnokicks = (ServerInstance->Modules->Find("m_nokicks.so") && channel->IsModeSet('Q'));
+ if((ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick.c_str()))){
+ user->WriteNumeric(482, "%s %s :Only a u-line may remove a u-line from a channel.", user->nick.c_str(), channame);
+ 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))
{
/* Build up the part reason string. */
reason = std::string("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());
+ channel->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "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
{
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 = "<nick> <channel> [<reason>]";
TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
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 = "<channel> <nick> [<reason>]";
TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END);
public:
- ModuleRemove(InspIRCd* Me)
- : Module(Me), cmd1(Me, this, supportnokicks), cmd2(Me, this, supportnokicks)
+ ModuleRemove() : cmd1(this, supportnokicks), cmd2(this, supportnokicks)
{
ServerInstance->AddCommand(&cmd1);
ServerInstance->AddCommand(&cmd2);
virtual void OnRehash(User* user)
{
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
}
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);
}
};