Allow PRIVMSG and NOTICE targets of $<servermask> to the module events (this wasnt trivial and is almost a damn feature)

git-svn-id: http://svn.inspircd.org/repository/branches/1_0_stable@4538 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 14 insertions, 8 deletions

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index f95c2dbac..4da092914 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -68,14 +68,20 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 		return;
 	if ((parameters[0][0] == '$') && ((*user->oper) || (is_uline(user->server))))
 	{
-		// notice to server mask
-		char* servermask = parameters[0];
-		servermask++;
-		if (match(Config->ServerName,servermask))
-		{
-			NoticeAll(user, true, "%s",parameters[1]);
-		}
-		return;
+		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;
+                parameters[1] = (char*)temp.c_str();
+                // notice to server mask
+                const char* servermask = parameters[0] + 1;
+                if (match(Config->ServerName,servermask))
+                {
+                        NoticeAll(user, true, "%s",parameters[1]);
+                }
+                FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
+                return;
 	}
 	char status = 0;
 	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))