Change to use std::string::iterator rather than making a copy of the pointer and...

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

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 18c6900f4050cdf60780b7ebca07dd484ab99caf..abf46814a1dd8f87c1aca242a088afd1d4f691c7 100644 (file)
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -33,6 +30,8 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
        userrec *dest;
        chanrec *chan;
 
+       CUList except_list;
+
        user->idle_lastmsg = ServerInstance->Time();
        
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
@@ -42,7 +41,7 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
        {
                int MOD_RESULT = 0;
                std::string temp = parameters[1];
-               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0));
+               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();
@@ -52,7 +51,7 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
                {
                        ServerInstance->ServerPrivmsgAll("%s",parameters[1]);
                }
-               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
+               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,except_list));
                return CMD_SUCCESS;
        }
        char status = 0;
@@ -64,6 +63,9 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
        if (parameters[0][0] == '#')
        {
                chan = ServerInstance->FindChan(parameters[0]);
+
+               except_list[user] = user;
+
                if (chan)
                {
                        if (IS_LOCAL(user))
@@ -82,20 +84,35 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
                        int MOD_RESULT = 0;
 
                        std::string temp = parameters[1];
-                       FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status));
+                       FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status,except_list));
                        if (MOD_RESULT) {
                                return CMD_FAILURE;
                        }
-                       parameters[1] = (char*)temp.c_str();
+                       parameters[1] = temp.c_str();
 
                        if (temp == "")
                        {
                                user->WriteServ("412 %s No text to send", user->nick);
                                return CMD_FAILURE;
                        }
-                       
-                       chan->WriteAllExceptSender(user, false, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
-                       FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status));
+
+                       if (status)
+                       {
+                               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 
+                       {
+                               chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name, parameters[1]);
+                       }
+
+                       FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status,except_list));
                }
                else
                {
@@ -118,7 +135,7 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
                int MOD_RESULT = 0;
                
                std::string temp = parameters[1];
-               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,dest,TYPE_USER,temp,0));
+               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,dest,TYPE_USER,temp,0,except_list));
                if (MOD_RESULT) {
                        return CMD_FAILURE;
                }
@@ -130,7 +147,7 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
                        user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
                }
 
-               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0));
+               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0,except_list));
        }
        else
        {