Update copyright headers.

[user/henk/code/inspircd.git] / src / modules / m_remove.cpp

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index d68a70503339e4d2dc37cd8607e6dc1a7a1c586c..c35b889b90297162e2eb2eee57417d9b664fe497 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -1,12 +1,18 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013, 2018, 2020-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Justin Crawford <Justasic@Gmail.com>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *   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>
+ *   Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
+ *   Copyright (C) 2005-2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -38,7 +44,7 @@ class RemoveBase : public Command
        ChanModeReference& nokicksmode;
 
  public:
-       unsigned int protectedrank;
+       unsigned int protectedrank;
 
        RemoveBase(Module* Creator, bool& snk, ChanModeReference& nkm, const char* cmdn)
                : Command(Creator, cmdn, 2, 3)
@@ -87,13 +93,13 @@ class RemoveBase : public Command
 
                if (!channel->HasUser(target))
                {
-                       user->WriteNotice(InspIRCd::Format("*** The user %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
+                       user->WriteNotice(InspIRCd::Format("*** User %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
                        return CMD_FAILURE;
                }
 
                if (target->server->IsULine())
                {
-                       user->WriteNumeric(482, channame, "Only a u-line may remove a u-line from a channel.");
+                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a U-line may remove a U-line from a channel.");
                        return CMD_FAILURE;
                }
 
@@ -102,7 +108,7 @@ class RemoveBase : public Command
                {
                        /* We'll let everyone remove their level and below, eg:
                         * ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1)
-                         a ulined target will get a higher level than it's possible for a /remover to get..so they're safe.
+                        * a ulined target will get a higher level than it's possible for a /remover to get..so they're safe.
                         * Nobody may remove people with >= protectedrank rank.
                         */
                        unsigned int ulevel = channel->GetPrefixValue(user);
@@ -135,21 +141,21 @@ class RemoveBase : public Command
                                /* Build up the part reason string. */
                                reason = "Removed by " + user->nick + ": " + reasonparam;
 
-                               channel->WriteNotice(InspIRCd::Format("%s removed %s from the channel", user->nick.c_str(), target->nick.c_str()));
+                               channel->WriteRemoteNotice(InspIRCd::Format("%s removed %s from the channel", user->nick.c_str(), target->nick.c_str()));
                                target->WriteNotice("*** " + user->nick + " removed you from " + channel->name + " with the message: " + reasonparam);
 
                                channel->PartUser(target, reason);
                        }
                        else
                        {
-                               user->WriteNotice(InspIRCd::Format("*** You do not have access to /remove %s from %s", target->nick.c_str(), channel->name.c_str()));
+                               user->WriteNotice(InspIRCd::Format("*** You do not have access to /REMOVE %s from %s", target->nick.c_str(), channel->name.c_str()));
                                return CMD_FAILURE;
                        }
                }
                else
                {
                        /* m_nokicks.so was loaded and +Q was set, block! */
-                       user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (nokicks mode is set)", target->nick.c_str()));
+                       user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (+Q is set)", target->nick.c_str()));
                        return CMD_FAILURE;
                }
 
@@ -165,7 +171,7 @@ class CommandRemove : public RemoveBase
        CommandRemove(Module* Creator, bool& snk, ChanModeReference& nkm)
                : RemoveBase(Creator, snk, nkm, "REMOVE")
        {
-               syntax = "<channel> <nick> [<reason>]";
+               syntax = "<channel> <nick> [:<reason>]";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
        }
 
@@ -183,7 +189,7 @@ class CommandFpart : public RemoveBase
        CommandFpart(Module* Creator, bool& snk, ChanModeReference& nkm)
                : RemoveBase(Creator, snk, nkm, "FPART")
        {
-               syntax = "<channel> <nick> [<reason>]";
+               syntax = "<channel> <nick> [:<reason>]";
                TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT);
        }
 
@@ -222,7 +228,7 @@ class ModuleRemove : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               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);
+               return Version("Adds the /FPART and /REMOVE commands which allows channel operators to force part users from a channel.", VF_OPTCOMMON | VF_VENDOR);
        }
 };