kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 6a9af4a4046c055d1c6d36cb3a4b562ab9c200ed..fbbeafec014c8ee1224cf46b5cc2127d438b041c 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -27,7 +27,7 @@
 #include "commands.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "cmd_notice.h"
+#include "commands/cmd_notice.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
@@ -36,25 +36,31 @@ extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern time_t TIME;
 
-void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *dest;
        chanrec *chan;
 
        user->idle_lastmsg = TIME;
        
-       if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,0))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
-       if ((parameters[0][0] == '$') && (*user->oper))
+       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] == '+'))