[SM-CVS] CVS: squirrelmail/class/deliver Deliver.class.php,1.18.2.10,1.18.2.11

[Thijs K. <ki...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/class/deliver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv839/class/deliver

Modified Files:
      Tag: SM-1_4-STABLE
	Deliver.class.php 
Log Message:
If we use the IP as the RHS of the Message-ID, we need to enclose it in brackets
(RFC 822). And if we have the hostname available, we might as well use that.
Spotted by Andreas M. Kirchwitz, closes #1001295


Index: Deliver.class.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/class/deliver/Deliver.class.php,v
retrieving revision 1.18.2.10
retrieving revision 1.18.2.11
diff -u -w -r1.18.2.10 -r1.18.2.11
--- Deliver.class.php	4 May 2004 21:57:28 -0000	1.18.2.10
+++ Deliver.class.php	3 Aug 2004 11:39:33 -0000	1.18.2.11
@@ -381,7 +381,7 @@
         $date = date('D, j M Y H:i:s ', mktime()) . $this->timezone();
         /* Create a message-id */
         $message_id = '<' . $REMOTE_PORT . '.' . $REMOTE_ADDR . '.';
-        $message_id .= time() . '.squirrel@' . $REMOTE_ADDR .'>';
+        $message_id .= time() . '.squirrel@' . (isset($REMOTE_HOST) ? $REMOTE_HOST : "[$REMOTE_ADDR]") .'>';
         /* Make an RFC822 Received: line */
         if (isset($REMOTE_HOST)) {
             $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])";
@@ -691,4 +691,6 @@
         return $refer;
     }
 }
+
+// vim: et ts=4
 ?>
\ No newline at end of file