Windows support. Tested and working to compile on freebsd and linux. Next step is...

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 6c0336fa5e9d357410e107e447c8dada6e7e561f..0f084ffc31afb72bf8ce90152dad41d0bed32039 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.
  *
@@ -22,7 +19,7 @@
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_notice(Instance);
 }
@@ -32,26 +29,28 @@ 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))
                return CMD_SUCCESS;
-       if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
+       if ((parameters[0][0] == '$') && (IS_OPER(user) || ServerInstance->ULine(user->server)))
        {
                int MOD_RESULT = 0;
-                std::string temp = parameters[1];
-                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0));
-                if (MOD_RESULT)
-                        return CMD_FAILURE;
-                parameters[1] = (char*)temp.c_str();
-                // notice to server mask
-                const char* servermask = parameters[0] + 1;
-                if (match(ServerInstance->Config->ServerName,servermask))
-                {
-                        user->NoticeAll("%s",parameters[1]);
-                }
-                FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
-                return CMD_SUCCESS;
+               std::string temp = parameters[1];
+               FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0,exempt_list));
+               if (MOD_RESULT)
+                       return CMD_FAILURE;
+               parameters[1] = temp.c_str();
+               // notice to server mask
+               const char* servermask = parameters[0] + 1;
+               if (match(ServerInstance->Config->ServerName,servermask))
+               {
+                       user->SendAll("NOTICE", "%s", parameters[1]);
+               }
+               FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
+               return CMD_SUCCESS;
        }
        char status = 0;
        if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[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->nick;
+
                if (chan)
                {
                        if (IS_LOCAL(user))
@@ -77,25 +79,38 @@ 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 == "")
+                       if (temp.empty())
                        {
                                user->WriteServ("412 %s No text to send", user->nick);
                                return CMD_FAILURE;
                        }
 
-                       chan->WriteAllExceptSender(user, false, 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
        {