Clarify handshake failure messages

[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 d17deb742fb82b96e677f9a55f2503c99feb2dd0..1bbc0931f51faf74e7e9eff2bc31469806d4b32d 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -29,8 +29,8 @@ 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)
        {
        }
 
@@ -103,11 +103,10 @@ class RemoveBase : public Command
                                /* 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
                        {
@@ -132,8 +131,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 = "<nick> <channel> [<reason>]";
                TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
@@ -158,8 +157,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 = "<channel> <nick> [<reason>]";
                TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END);
@@ -187,8 +186,7 @@ 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)
        {
                ServerInstance->AddCommand(&cmd1);
                ServerInstance->AddCommand(&cmd2);
@@ -205,7 +203,7 @@ class ModuleRemove : public Module
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader conf(ServerInstance);
+               ConfigReader conf;
                supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
        }
 
@@ -215,7 +213,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);
        }
 
 };