Forward port r9782: show IP (not unknown) for unauthed connections

[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 9450899ed73ad9bf10b1ff2c0ae61396685069af..f0eff03cab0dd9bf08a2bfb7eb65a93dd493ba4e 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -105,7 +105,7 @@ class RemoveBase
 
                if (!channel->HasUser(target))
                {
-                       user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick.c_str(), target->nick.c_str(), channel->name);
+                       user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick.c_str(), target->nick.c_str(), channel->name.c_str());
                        return CMD_FAILURE;
                }       
                
@@ -177,22 +177,22 @@ class RemoveBase
                                /* 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, 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, reasonparam.c_str());
+                               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.c_str()))
                                        delete channel;
                        }
                        else
                        {
-                               user->WriteServ( "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick.c_str(), target->nick.c_str(), channel->name);
+                               user->WriteServ( "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick.c_str(), target->nick.c_str(), channel->name.c_str());
                                return CMD_FAILURE;
                        }
                }
                else
                {
                        /* m_nokicks.so was loaded and +Q was set, block! */
-                       user->WriteServ( "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick.c_str(), channel->name, target->nick.c_str());
+                       user->WriteServ( "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick.c_str(), channel->name.c_str(), target->nick.c_str());
                        return CMD_FAILURE;
                }