From a536380680dc05c49c5875b9d3716b747293606f Mon Sep 17 00:00:00 2001 From: gustavf Date: Thu, 6 Jul 2000 11:35:49 +0000 Subject: [PATCH] Some more modifications to the received line. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@598 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/smtp.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/functions/smtp.php b/functions/smtp.php index b7ececf2..bce1cd62 100644 --- a/functions/smtp.php +++ b/functions/smtp.php @@ -110,6 +110,7 @@ global $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT; global $data_dir, $username, $domain, $version, $useSendmail; global $default_charset, $HTTP_VIA, $HTTP_X_FORWARDED_FOR; + global $REMOTE_HOST; // Storing the header to make sure the header is the same // everytime the header is printed. @@ -142,17 +143,23 @@ /* Create a message-id */ $message_id = "<" . $REMOTE_PORT . "." . $REMOTE_ADDR . "."; - $message_id .= time() . "@" . $SERVER_NAME .">"; + $message_id .= time() . ".squirrel@" . $SERVER_NAME .">"; /* Make an RFC822 Received: line */ - $received_from = "$REMOTE_ADDR"; + if (isset($REMOTE_HOST)) + $received_from = "$REMOTE_HOST ($username@[$REMOTE_ADDR])"; + else + $received_from = "$REMOTE_ADDR ($username@[$REMOTE_ADDR])"; + if (isset($HTTP_VIA) || isset ($HTTP_X_FORWARDED_FOR)) { if ($HTTP_X_FORWARDED_FOR == "") $HTTP_X_FORWARDED_FOR = "unknown"; $received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)"; } - $header = "Received: from $received_from by $SERVER_NAME with HTTP; "; - $header .= "$date\r\n"; + + $header = "Received: from $received_from\r\n"; + $header .= " by $SERVER_NAME with HTTP;\r\n"; + $header .= " $date\r\n"; /* Insert the rest of the header fields */ $header .= "Message-ID: $message_id\r\n"; -- 2.25.1