Put back different stats numerics for /stats g, /stats k etc

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

diff --git a/src/commands/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp
index 96aff839246ae6c00a621ea031e0a6401391fec8..5be9d4cff865db3bb85930df4ba65252ee38951a 100644 (file)
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.cpp
@@ -41,6 +41,7 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
                parameters[1] = temp.c_str();
                // notice to server mask
                const char* servermask = parameters[0] + 1;
+               FOREACH_MOD(I_OnText,OnText(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,except_list));
                if (match(ServerInstance->Config->ServerName,servermask))
                {
                        user->SendAll("PRIVMSG", "%s", parameters[1]);
@@ -91,6 +92,8 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
                                return CMD_FAILURE;
                        }
 
+                       FOREACH_MOD(I_OnText,OnText(user,chan,TYPE_CHANNEL,parameters[1],status,except_list));
+
                        if (status)
                        {
                                if (ServerInstance->Config->UndernetMsgPrefix)
@@ -118,10 +121,29 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
                return CMD_SUCCESS;
        }
 
+       const char* destnick = parameters[0];
+
        if (IS_LOCAL(user))
-               dest = ServerInstance->FindNickOnly(parameters[0]);
+       {
+               const char* targetserver = strchr(destnick, '@');
+       
+               if (targetserver)
+               {
+                       char nickonly[NICKMAX+1];
+                       strlcpy(nickonly, destnick, targetserver - destnick + 1);
+                       dest = ServerInstance->FindNickOnly(nickonly);
+                       if (dest && strcasecmp(dest->server, targetserver + 1))
+                       {
+                               /* Incorrect server for user */
+                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                               return CMD_FAILURE;
+                       }
+               }
+               else
+                       dest = ServerInstance->FindNickOnly(destnick);
+       }
        else
-               dest = ServerInstance->FindNick(parameters[0]);
+               dest = ServerInstance->FindNick(destnick);
 
        if (dest)
        {
@@ -146,6 +168,8 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
                }
                parameters[1] = (char*)temp.c_str();
 
+               FOREACH_MOD(I_OnText,OnText(user,dest,TYPE_USER,parameters[1],0,except_list));
+
                if (IS_LOCAL(dest))
                {
                        // direct write, same server