If SERVER_NAME not set, use $domain as the domain in message-id.

[squirrelmail.git] / class / deliver / Deliver.class.php

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index ede362173bcfbec2299fa1f7fcc045796f3fdb5c..4f98c7808c4713d9c89352071114fe0a4e1eebb1 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -226,19 +226,20 @@ class Deliver {
     }    
 
     function prepareRFC822_Header($rfc822_header, $reply_rfc822_header, &$raw_length) {
-        $REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
-        $SERVER_NAME = $_SERVER['SERVER_NAME'];
-        $REMOTE_PORT = $_SERVER['REMOTE_PORT'];
-        if(isset($_SERVER['REMOTE_HOST'])) {
-            $REMOTE_HOST = $_SERVER['REMOTE_HOST'];
-        }
-        if(isset($_SERVER['HTTP_VIA'])) {
-            $HTTP_VIA = $_SERVER['HTTP_VIA'];
-        }
-        if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-            $HTTP_X_FORWARDED_FOR = $_SERVER['HTTP_X_FORWARDED_FOR'];
-        }
-       global $version, $username;
+
+       global $domain, $version, $username;
+
+       /* if server var SERVER_NAME not available, use $domain */
+        if(!sqGetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER)) {
+            $SERVER_NAME = $domain;
+       }
+
+       sqGetGlobalVar('REMOTE_ADDR', $REMOTE_ADDR, SQ_SERVER);
+       sqGetGlobalVar('REMOTE_PORT', $REMOTE_PORT, SQ_SERVER);
+       sqGetGlobalVar('REMOTE_HOST', $REMOTE_HOST, SQ_SERVER);
+       sqGetGlobalVar('HTTP_VIA',    $HTTP_VIA,    SQ_SERVER);
+       sqGetGlobalVar('HTTP_X_FORWARDED_FOR', $HTTP_X_FORWARDED_FOR, SQ_SERVER);
+
        $rn = "\r\n";
        /* This creates an RFC 822 date */
        $date = date('D, j M Y H:i:s ', mktime()) . $this->timezone();
@@ -273,24 +274,24 @@ class Deliver {
        }       
        $header[] = "Date: $date" . $rn;
         $header[] = 'Subject: '.encodeHeader($rfc822_header->subject) . $rn;
-        $header[] = 'From: '. encodeHeader($rfc822_header->getAddr_s('from')) . $rn;
+        $header[] = 'From: '. $rfc822_header->getAddr_s('from',',',true) . $rn;
        /* RFC2822 if from contains more then 1 address */      
         if (count($rfc822_header->from) > 1) {
-           $header[] = 'Sender: '. encodeHeader($rfc822_header->getAddr_s('sender')) . $rn;
+           $header[] = 'Sender: '. $rfc822_header->getAddr_s('sender',',',true) . $rn;
        }
        if (count($rfc822_header->to)) {
-           $header[] = 'To: '. encodeHeader($rfc822_header->getAddr_s('to')) . $rn;
+           $header[] = 'To: '. $rfc822_header->getAddr_s('to',',',true) . $rn;
         }
        if (count($rfc822_header->cc)) {
-           $header[] = 'Cc: '. encodeHeader($rfc822_header->getAddr_s('cc')) . $rn;
+           $header[] = 'Cc: '. $rfc822_header->getAddr_s('cc',',',true) . $rn;
        }
        if (count($rfc822_header->reply_to)) {
-           $header[] = 'Reply-To: '. encodeHeader($rfc822_header->getAddr_s('reply_to')) . $rn;
+           $header[] = 'Reply-To: '. $rfc822_header->getAddr_s('reply_to',',',true) . $rn;
        }
        /* Sendmail should return true. Default = false */
        $bcc = $this->getBcc();
        if (count($rfc822_header->bcc)) {
-           $s = 'Bcc: '. encodeHeader($rfc822_header->getAddr_s('bcc')) . $rn;
+           $s = 'Bcc: '. $rfc822_header->getAddr_s('bcc',',',true) . $rn;
            if (!$bcc) {
               $s = $this->foldLine($s, 78, str_pad('',4));
               $raw_length += strlen($s);
@@ -341,8 +342,6 @@ class Deliver {
        for ($i = 0 ; $i < $cnt ; $i++) {
            $hdr_s .= $this->foldLine($header[$i], 78, str_pad('',4));
        }
-//     $debug = "Debug: <123456789012345678901234567890123456789012345678901234567890123456789>\r\n";
-//     $this->foldLine($debug, 78, str_pad('',4));
        $header = $hdr_s;
        $header .= $rn; /* One blank line to separate header and body */
        $raw_length += strlen($header);