From e3bd782207f50d131acd008b0cbcc7545aac7690 Mon Sep 17 00:00:00 2001 From: brain Date: Mon, 19 May 2008 00:29:53 +0000 Subject: More done git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9759 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_remove.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/modules/m_remove.cpp') diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 008b4c82d..9450899ed 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -99,13 +99,13 @@ class RemoveBase /* Fix by brain - someone needs to learn to validate their input! */ if (!target || !channel) { - user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, !target ? username : channame); + user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), !target ? username : channame); return CMD_FAILURE; } if (!channel->HasUser(target)) { - user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick, target->nick, channel->name); + user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick.c_str(), target->nick.c_str(), channel->name); return CMD_FAILURE; } @@ -114,7 +114,7 @@ class RemoveBase protectkey = "cm_protect_" + std::string(channel->name); founderkey = "cm_founder_" + std::string(channel->name); - if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick)) + if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick.c_str())) { ulevel = chartolevel("U"); } @@ -132,7 +132,7 @@ class RemoveBase } /* Now it's the same idea, except for the target. If they're ulined make sure they get a higher level than the sender can */ - if (ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick)) + if (ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick.c_str())) { tlevel = chartolevel("U"); } @@ -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, target->nick); - target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick, user->nick, channel->name, reasonparam.c_str()); + 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()); 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, target->nick, 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); 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, channel->name, target->nick); + user->WriteServ( "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick.c_str(), channel->name, target->nick.c_str()); return CMD_FAILURE; } -- cgit v1.2.3