This check now already happens in sqimap_login, no need to do it twice

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index 78c036d3b17c418e9ddbd0839d48705d586c7688..69fab1d28c512a0c38bc24168e6d9b954350cc80 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -661,9 +661,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
             $send_to_cc = replyAllString($orig_header);
         case ('reply'):
             $send_to = $orig_header->reply_to;
-            if (is_object($send_to)) {
-                $send_to = decodeHeader($send_to->getAddr_s('reply_to'));
-            } else {
+            if (is_array($send_to) && count($send_to)) {
+                $send_to = decodeHeader($orig_header->getAddr_s('reply_to'));
+            } else if (is_object($send_to)) { /* unnessecarry, just for falesafe purpose */
+                $send_to = decodeHeader($orig_header->getAddr_s('reply_to'));
+           } else {
                 $send_to = decodeHeader($orig_header->getAddr_s('from'));
             }
             $subject =  decodeHeader($orig_header->subject);
@@ -1274,7 +1276,7 @@ function deliverMessage($composeMessage, $draft=false) {
     if ($full_name) {
         $from = $rfc822_header->from[0];
        if (!$from->host) $from->host = $domain;
-       $from_addr = $full_name .' <'.$from->mailbox.'@'.$from->host.'>';
+       $from_addr = '"'.$full_name .'" <'.$from->mailbox.'@'.$from->host.'>';
         $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);
     }
     if ($reply_to) {
@@ -1348,7 +1350,7 @@ function deliverMessage($composeMessage, $draft=false) {
           $length = $imap_deliver->mail($composeMessage);
           sqimap_append ($imap_stream, $draft_folder, $length);         
            $imap_deliver->mail($composeMessage, $imap_stream);
-          sqimap_append_done ($imap_stream);
+          sqimap_append_done ($imap_stream, $draft_folder);
           sqimap_logout($imap_stream);
           unset ($imap_deliver);
           return $length;
@@ -1375,7 +1377,7 @@ function deliverMessage($composeMessage, $draft=false) {
            require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
            $imap_deliver = new Deliver_IMAP();
            $imap_deliver->mail($composeMessage, $imap_stream);
-           sqimap_append_done ($imap_stream);
+           sqimap_append_done ($imap_stream, $sent_folder);
            unset ($imap_deliver);
        }
        global $passed_id, $mailbox, $action;