X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=class%2Fdeliver%2FDeliver.class.php;h=5101f3230b6006e2f3738fab6d0369874c16502b;hb=99c1c0d68404803c93956796077435d43f047d10;hp=f22b5f877e05d11b819bd7f13058e82bccf4a2f4;hpb=f2ac3325d474dea1fc8b82d25099256c78bee803;p=squirrelmail.git

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index f22b5f87..5101f323 100644
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -378,7 +378,7 @@ class Deliver {
      * @return string $header
      */
     function prepareRFC822_Header($rfc822_header, $reply_rfc822_header, &$raw_length) {
-        global $domain, $version, $username, $encode_header_key, 
+        global $domain, $version, $username, $encode_header_key,
                $edit_identity, $hide_auth_header;
 
         /* if server var SERVER_NAME not available, use $domain */
@@ -395,7 +395,7 @@ class Deliver {
         $rn = "\r\n";
 
         /* This creates an RFC 822 date */
-        $date = date('D, j M Y H:i:s ', mktime()) . $this->timezone();
+        $date = date('D, j M Y H:i:s ', time()) . $this->timezone();
         /* Create a message-id */
         $message_id = '<' . $REMOTE_PORT . '.';
         if (isset($encode_header_key) && trim($encode_header_key)!='') {
@@ -430,7 +430,7 @@ class Deliver {
          *
          * Add $hide_squirrelmail_header as a candidate for config_local.php
          * to allow completely hiding SquirrelMail participation in message
-         * processing; This is dangerous, especially if users can modify their 
+         * processing; This is dangerous, especially if users can modify their
          * account information, as it makes mapping a sent message back to the
          * original sender almost impossible.
          */
@@ -513,7 +513,7 @@ class Deliver {
         if ($encoding = $rfc822_header->encoding) {
             $header[] = 'Content-Transfer-Encoding: ' . $encoding .  $rn;
         }
-        if ($rfc822_header->dnt) {
+        if (isset($rfc822_header->dnt) && $rfc822_header->dnt) {
             $dnt = $rfc822_header->getAddr_s('dnt');
             /* Pegasus Mail */
             $header[] = 'X-Confirm-Reading-To: '.$dnt. $rn;
@@ -733,7 +733,7 @@ class Deliver {
         $aReferences = preg_split('/\s+/', $hdr->references);
         $message_id = $hdr->message_id;
         $in_reply_to = $hdr->in_reply_to;
-	
+
         // if References already exists, add the current message ID at the end.
         // no References exists; if we know a IRT, add that aswell
         if (count($aReferences) == 0 && $in_reply_to) {
@@ -742,7 +742,7 @@ class Deliver {
         $aReferences[] = $message_id;
 
         // sanitize the array: trim whitespace, remove dupes
-        array_walk($aReferences, 'trim_value');
+        array_walk($aReferences, 'sq_trim_value');
         $aReferences = array_unique($aReferences);
 
         while ( count($aReferences) > 4 && strlen(implode(' ', $aReferences)) >= 986 ) {
@@ -751,13 +751,6 @@ class Deliver {
         return implode(' ', $aReferences);
     }
 
-    /**
-     * Callback function to trim whitespace from a value, to be used in array_walk
-     */
-    function trim_value ( &$value ) {
-        $value = trim($value);
-    }
-
     /**
      * Converts ip address to hexadecimal string
      *
@@ -819,5 +812,3 @@ class Deliver {
         return $ret;
     }
 }
-
-?>