Fixed return address of MDN receipts when having multiple identities (patch #530139)

[squirrelmail.git] / functions / smtp.php

diff --git a/functions/smtp.php b/functions/smtp.php
index 122ab7e49503529623e0f03b2066f944799098c2..b553a62d641c1d9b661dec5076398407a7dddbdd 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -149,7 +149,7 @@ function attachFiles ($fp, $session) {
                     $header .= "Content-Disposition: attachment; filename=\""
                         . $info['remotefilename'] . "\"$rn";
                 } else {
-                    $header .= "Content-Type: $filetype;$rn";
+                    $header .= "Content-Type: $filetype$rn";
                 }
 
                 
@@ -912,11 +912,19 @@ function createPriorityHeaders($prio) {
 
 function createReceiptHeaders($receipt) {
 
-    GLOBAL $data_dir, $username;
+    GLOBAL $data_dir, $username, $identity;
 
     $receipt_headers = Array();
-    $from_addr = getPref($data_dir, $username, 'email_address');
-    $from = getPref($data_dir, $username, 'full_name');
+    if (isset($identity) && $identity != 'default') {
+        $from = getPref($data_dir, $username, 'full_name' . $identity);
+        $from_addr = getPref($data_dir, $username, 'email_address' . $identity);
+    } else {
+        $from = getPref($data_dir, $username, 'full_name');
+        $from_addr = getPref($data_dir, $username, 'email_address');
+    }
+    if ($from_addr == '') {
+        $from_addr = $popuser.'@'.$domain;
+    }
 
     if ($from == '') {
         $from = "<$from_addr>";