WriteChannel* functions and ChanExceptSender* functions are now methods of chanrec...

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

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 81e5ee016c93ac220091aba33b3b2c45c6726876..07b39e96a97ca229dcf6ba50c1471b665387fb2a 100644 (file)
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -33,24 +33,31 @@ extern ModuleList modules;
 extern FactoryList factory;
 extern time_t TIME;
 
-void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_privmsg::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) || (is_uline(user->server))))
        {
+               int MOD_RESULT = 0;
+               std::string temp = parameters[1];
+               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0));
+               if (MOD_RESULT)
+                       return;
+               parameters[1] = (char*)temp.c_str();
                // notice to server mask
-               char* servermask = parameters[0];
-               servermask++;
+               const char* servermask = parameters[0] + 1;
                if (match(Config->ServerName,servermask))
                {
                        ServerPrivmsgAll("%s",parameters[1]);
                }
+               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
                return;
        }
        char status = 0;
@@ -92,7 +99,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
                                return;
                        }
                        
-                       ChanExceptSender(chan, user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
+                       chan->WriteAllExceptSender(user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
                        FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status));
                }
                else