Move OnSync{Channel,Network,User} to ServerEventListener.

[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 5b0efe2a27a6e14c095d06a7c92fbb4af6cafc6e..dfe6247020cef4ed716e6a511e75346a244011fb 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -108,7 +108,7 @@ class RemoveBase : public Command
                                if (!IS_LOCAL(target))
                                {
                                        // Send an ENCAP REMOVE with parameters being in the old <user> <chan> order which is
-                                       // compatible with both 2.0 and 2.2. This also turns FPART into REMOVE.
+                                       // compatible with both 2.0 and 3.0. This also turns FPART into REMOVE.
                                        std::vector<std::string> p;
                                        p.push_back(target->uuid);
                                        p.push_back(channel->name);
@@ -130,7 +130,7 @@ class RemoveBase : public Command
                                /* Build up the part reason string. */
                                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());
+                               channel->WriteNotice(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);
@@ -164,7 +164,7 @@ class CommandRemove : public RemoveBase
                TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
        {
                return HandleRMB(parameters, user, false);
        }
@@ -182,7 +182,7 @@ class CommandFpart : public RemoveBase
                TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT);
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
        {
                return HandleRMB(parameters, user, true);
        }