Add SMTP setting to suppress SquirrelMail Received: header..

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

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index ec35af1cdc41dda1fdf4f7ea9ccb0f2750e19b5c..2c335f9933b781fb5238d670bcc6273f2e6f8b71 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -361,7 +361,7 @@ class Deliver {
      * @return string $header
      */
     function prepareRFC822_Header($rfc822_header, $reply_rfc822_header, &$raw_length) {
-        global $domain, $version, $username;
+        global $domain, $version, $username, $skip_SM_header;
 
         /* if server var SERVER_NAME not available, use $domain */
         if(!sqGetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER)) {
@@ -394,10 +394,13 @@ class Deliver {
             $received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)";
         }
         $header = array();
-        $header[] = "Received: from $received_from" . $rn;
-        $header[] = "        (SquirrelMail authenticated user $username);" . $rn;
-        $header[] = "        by $SERVER_NAME with HTTP;" . $rn;
-        $header[] = "        $date" . $rn;
+        if ( !isset($skip_SM_header) || !$skip_SM_header )
+        {
+          $header[] = "Received: from $received_from" . $rn;
+          $header[] = "        (SquirrelMail authenticated user $username);" . $rn;
+          $header[] = "        by $SERVER_NAME with HTTP;" . $rn;
+          $header[] = "        $date" . $rn;
+        }
         /* Insert the rest of the header fields */
         $header[] = 'Message-ID: '. $message_id . $rn;
         if ($reply_rfc822_header->message_id) {