Don't start message ID with a dot when no remote port is available

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12841 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index 59312eb..ddb3436 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -496,7 +496,8 @@ class Deliver {
         /* This creates an RFC 822 date */
         $date = date('D, j M Y H:i:s ', time()) . $this->timezone();
         /* Create a message-id */
         /* This creates an RFC 822 date */
         $date = date('D, j M Y H:i:s ', time()) . $this->timezone();
         /* Create a message-id */

-        $message_id = '<' . $REMOTE_PORT . '.';
+        $message_id = '<' . (!empty($REMOTE_PORT) ? $REMOTE_PORT . '.' : '');
+//FIXME: if $REMOTE_ADDR is missing, should we skip this if/else block?  or perhaps try to generate it with some different kind of info?

         if (isset($encode_header_key) && trim($encode_header_key)!='') {
             // use encrypted form of remote address
             $message_id.= OneTimePadEncrypt($this->ip2hex($REMOTE_ADDR),base64_encode($encode_header_key));
         if (isset($encode_header_key) && trim($encode_header_key)!='') {
             // use encrypted form of remote address
             $message_id.= OneTimePadEncrypt($this->ip2hex($REMOTE_ADDR),base64_encode($encode_header_key));