Fix total mess of makefile dependency macros (all depending on stuff they dont NEED...

[user/henk/code/inspircd.git] / src / commands / cmd_privmsg.cpp

diff --git a/src/commands/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp
index a3d64f0841362ef55e088aa64029e7e0085fc082..0086bb72debb4264baa8995f578b2a1cce83b8d9 100644 (file)
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.cpp
@@ -28,7 +28,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
 
        user->idle_lastmsg = ServerInstance->Time();
        
-       if (ServerInstance->Parser->LoopCall(user, this, parameters, parameters.size(), 0))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, 0))
                return CMD_SUCCESS;
 
        if ((parameters[0][0] == '$') && (IS_OPER(user) || ServerInstance->ULine(user->server)))
@@ -70,12 +70,12 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                        {
                                if ((chan->IsModeSet('n')) && (!chan->HasUser(user)))
                                {
-                                       user->WriteNumeric(404, "%s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
+                                       user->WriteNumeric(404, "%s %s :Cannot send to channel (no external messages)", user->nick.c_str(), chan->name.c_str());
                                        return CMD_FAILURE;
                                }
                                if ((chan->IsModeSet('m')) && (chan->GetStatus(user) < STATUS_VOICE))
                                {
-                                       user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick, chan->name);
+                                       user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick.c_str(), chan->name.c_str());
                                        return CMD_FAILURE;
                                }
                        }
@@ -91,7 +91,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                        /* Check again, a module may have zapped the input string */
                        if (temp.empty())
                        {
-                               user->WriteNumeric(412, "%s :No text to send", user->nick);
+                               user->WriteNumeric(412, "%s :No text to send", user->nick.c_str());
                                return CMD_FAILURE;
                        }
 
@@ -101,16 +101,16 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                        {
                                if (ServerInstance->Config->UndernetMsgPrefix)
                                {
-                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, text);
+                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name.c_str(), status, text);
                                }
                                else
                                {
-                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name, text);
+                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name.c_str(), text);
                                }
                        }
                        else 
                        {
-                               chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name, text);
+                               chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name.c_str(), text);
                        }
 
                        FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,text,status,except_list));
@@ -118,7 +118,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                else
                {
                        /* no such nick/channel */
-                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, target);
+                       user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), target);
                        return CMD_FAILURE;
                }
                return CMD_SUCCESS;
@@ -132,13 +132,14 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        
                if (targetserver)
                {
-                       char nickonly[NICKMAX+1];
-                       strlcpy(nickonly, destnick, targetserver - destnick + 1);
+                       std::string nickonly;
+
+                       nickonly.assign(destnick, 0, targetserver - destnick + 1);
                        dest = ServerInstance->FindNickOnly(nickonly);
                        if (dest && strcasecmp(dest->server, targetserver + 1))
                        {
                                /* Incorrect server for user */
-                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0].c_str());
+                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
                                return CMD_FAILURE;
                        }
                }
@@ -152,14 +153,14 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        {
                if (parameters[1].empty())
                {
-                       user->WriteNumeric(412, "%s :No text to send", user->nick);
+                       user->WriteNumeric(412, "%s :No text to send", user->nick.c_str());
                        return CMD_FAILURE;
                }
 
                if (IS_AWAY(dest))
                {
                        /* auto respond with aweh msg */
-                       user->WriteNumeric(301, "%s %s :%s",user->nick,dest->nick,dest->awaymsg);
+                       user->WriteNumeric(301, "%s %s :%s", user->nick.c_str(), dest->nick.c_str(), dest->awaymsg.c_str());
                }
 
                int MOD_RESULT = 0;
@@ -176,7 +177,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                if (IS_LOCAL(dest))
                {
                        // direct write, same server
-                       user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, text);
+                       user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick.c_str(), text);
                }
 
                FOREACH_MOD(I_OnUserMessage,OnUserMessage(user, dest, TYPE_USER, text, 0, except_list));
@@ -184,7 +185,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        else
        {
                /* no such nick/channel */
-               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0].c_str());
+               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
        return CMD_SUCCESS;