* Adds multiple identities ("From:" addresses)

[squirrelmail.git] / functions / smtp.php

diff --git a/functions/smtp.php b/functions/smtp.php
index af8b88454e7e369d04ad3bb49c2cc7d930c209f4..d531f1dc8f779571bff5ef004db9c230e42e7766 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -39,8 +39,14 @@
 
    // looks up aliases in the addressbook and expands them to
    // the full address.
+   // Adds @$domain if it wasn't in the address book and if it
+   // doesn't have an @ symbol in it
    function expandAddrs ($array) {
-      $abook = addressbook_init();
+      global $domain;
+      
+      // don't show errors -- kinda critical that we don't see
+      // them here since the redirect won't work if we do show them
+      $abook = addressbook_init(false);
       for ($i=0; $i < count($array); $i++) {
          $result = $abook->lookup($array[$i]);
          $ret = "";
@@ -55,6 +61,10 @@
         {
            $array[$i] = '<' . $array[$i] . '>';
         }
+        
+        if (strpos($array[$i], '@') === false) {
+           $array[$i] .= '@' . $domain;
+        }
       }
       return $array;
    }
@@ -78,16 +88,30 @@
                $info['remotefilename'] . "\"\r\n";
             $header .= "Content-Disposition: attachment; filename=\"" .
                $info['remotefilename'] . "\"\r\n";
-            $header .= "Content-Transfer-Encoding: base64\r\n\r\n";
-            fputs ($fp, $header);
-            $length += strlen($header);
             
             $file = fopen ($attachment_dir . $info['localfilename'], 'r');
-            while ($tmp = fread($file, 570)) {
-               $encoded = chunk_split(base64_encode($tmp));
-               $length += strlen($encoded);
-               fputs ($fp, $encoded);
-            }
+           if (substr($filetype, 0, 5) == 'text/' ||
+               $filetype == 'message/rfc822') {
+              $header .= "\r\n";
+               fputs ($fp, $header);
+               $length += strlen($header);
+              while ($tmp = fgets($file, 4096)) {
+                 $tmp = str_replace("\r\n", "\n", $tmp);
+                 $tmp = str_replace("\r", "\n", $tmp);
+                 $tmp = str_replace("\n", "\r\n", $tmp);
+                 fputs($fp, $tmp);
+                 $length += strlen($tmp);
+              }
+           } else {
+               $header .= "Content-Transfer-Encoding: base64\r\n\r\n";
+               fputs ($fp, $header);
+               $length += strlen($header);
+               while ($tmp = fread($file, 570)) {
+                  $encoded = chunk_split(base64_encode($tmp));
+                  $length += strlen($encoded);
+                  fputs ($fp, $encoded);
+               }
+           }
             fclose ($file);
          }
       }
@@ -149,7 +173,7 @@
       global $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT;
       global $data_dir, $username, $popuser, $domain, $version, $useSendmail;
       global $default_charset, $HTTP_VIA, $HTTP_X_FORWARDED_FOR;
-      global $REMOTE_HOST;
+      global $REMOTE_HOST, $identity;
 
       // Storing the header to make sure the header is the same
       // everytime the header is printed.
@@ -159,9 +183,18 @@
          $to = expandAddrs(parseAddrs($t));
          $cc = expandAddrs(parseAddrs($c));
          $bcc = expandAddrs(parseAddrs($b));
-         $reply_to = getPref($data_dir, $username, 'reply_to');
-         $from = getPref($data_dir, $username, 'full_name');
-         $from_addr = getPref($data_dir, $username, 'email_address');
+        if (isset($identity) && $identity != 'default')
+        {
+           $reply_to = getPref($data_dir, $username, 'reply_to' . $identity);
+           $from = getPref($data_dir, $username, 'full_name' . $identity);
+           $from_addr = getPref($data_dir, $username, 'email_address' . $identity);
+        }
+        else
+        {
+            $reply_to = getPref($data_dir, $username, 'reply_to');
+            $from = getPref($data_dir, $username, 'full_name');
+            $from_addr = getPref($data_dir, $username, 'email_address');
+        }
 
          if ($from_addr == '')
             $from_addr = $popuser.'@'.$domain;
@@ -326,12 +359,15 @@
 
    function sendSMTP($t, $c, $b, $subject, $body, $more_headers) {
       global $username, $popuser, $domain, $version, $smtpServerAddress, $smtpPort,
-         $data_dir, $color, $use_authenticated_smtp;
+         $data_dir, $color, $use_authenticated_smtp, $identity;
 
       $to = expandAddrs(parseAddrs($t));
       $cc = expandAddrs(parseAddrs($c));
       $bcc = expandAddrs(parseAddrs($b));
-      $from_addr = getPref($data_dir, $username, 'email_address');
+      if (isset($identity) && $identity != 'default')
+        $from_addr = getPref($data_dir, $username, 'email_address' . $identity);
+      else
+         $from_addr = getPref($data_dir, $username, 'email_address');
 
       if (!$from_addr)
          $from_addr = "$popuser@$domain";