Fix this not working.

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index d018e1eb2a719c0602336f722af971d9a692249a..df0e518b05aa218b157342800fa0fda40bf81fa4 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.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.
  *
@@ -32,6 +29,8 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
        userrec *dest;
        chanrec *chan;
 
+       CUList exempt_list;
+
        user->idle_lastmsg = ServerInstance->Time();
        
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
@@ -40,7 +39,7 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
        {
                int MOD_RESULT = 0;
                 std::string temp = parameters[1];
-                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0));
+                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0,exempt_list));
                 if (MOD_RESULT)
                         return CMD_FAILURE;
                 parameters[1] = (char*)temp.c_str();
@@ -50,7 +49,7 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                 {
                         user->NoticeAll("%s",parameters[1]);
                 }
-                FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
+                FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
                 return CMD_SUCCESS;
        }
        char status = 0;
@@ -62,6 +61,9 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
        if (*parameters[0] == '#')
        {
                chan = ServerInstance->FindChan(parameters[0]);
+
+               exempt_list[user] = user;
+
                if (chan)
                {
                        if (IS_LOCAL(user))
@@ -77,15 +79,14 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                                        return CMD_FAILURE;
                                }
                        }
-
                        int MOD_RESULT = 0;
 
                        std::string temp = parameters[1];
-                       FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status));
+                       FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status, exempt_list));
                        if (MOD_RESULT) {
                                return CMD_FAILURE;
                        }
-                       parameters[1] = (char*)temp.c_str();
+                       parameters[1] = temp.c_str();
 
                        if (temp == "")
                        {
@@ -93,9 +94,23 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                                return CMD_FAILURE;
                        }
 
-                       chan->WriteAllExceptSender(user, status, "NOTICE %s :%s", chan->name, parameters[1]);
+                       if (status)
+                       {
+                               if (ServerInstance->Config->UndernetMsgPrefix)
+                               {
+                                       chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, parameters[1]);
+                               }
+                               else
+                               {
+                                       chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name, parameters[1]);
+                               }
+                       }
+                       else
+                       {
+                               chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name, parameters[1]);
+                       }
 
-                       FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status));
+                       FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status,exempt_list));
                }
                else
                {
@@ -112,7 +127,7 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                int MOD_RESULT = 0;
                
                std::string temp = parameters[1];
-               FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0));
+               FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0,exempt_list));
                if (MOD_RESULT) {
                        return CMD_FAILURE;
                }
@@ -124,7 +139,7 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                        user->WriteTo(dest, "NOTICE %s :%s", dest->nick, parameters[1]);
                }
 
-               FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0));
+               FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0,exempt_list));
        }
        else
        {