Refactor port binding, warning not yet tested fully

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

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index b1216567006d1330f6a29548d3fbffc88b61e792..b0662cfec051e02e10b51805896ded92a7a03a5e 100644 (file)
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -44,12 +44,12 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
                FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0,except_list));
                if (MOD_RESULT)
                        return CMD_FAILURE;
-               parameters[1] = (char*)temp.c_str();
+               parameters[1] = temp.c_str();
                // notice to server mask
                const char* servermask = parameters[0] + 1;
                if (match(ServerInstance->Config->ServerName,servermask))
                {
-                       ServerInstance->ServerPrivmsgAll("%s",parameters[1]);
+                       user->SendAll("PRIVMSG", "%s", parameters[1]);
                }
                FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,except_list));
                return CMD_SUCCESS;
@@ -64,7 +64,7 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
        {
                chan = ServerInstance->FindChan(parameters[0]);
 
-               except_list[user] = user;
+               except_list[user] = user->nick;
 
                if (chan)
                {
@@ -90,7 +90,7 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                        parameters[1] = temp.c_str();
 
-                       if (temp == "")
+                       if (temp.empty())
                        {
                                user->WriteServ("412 %s No text to send", user->nick);
                                return CMD_FAILURE;
@@ -98,7 +98,14 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 
                        if (status)
                        {
-                               chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, parameters[1]);
+                               if (ServerInstance->Config->UndernetMsgPrefix)
+                               {
+                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, parameters[1]);
+                               }
+                               else
+                               {
+                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name, parameters[1]);
+                               }
                        }
                        else 
                        {