X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=a76e7e65abdc9ac9ad2650bd07880fcbc8bbeba6;hb=7e2ddf11abed8b8a93bc437fde95cfeba987a091;hp=cc73869c83c23d1b20a0793923ee77f95f901994;hpb=0d73f4ee78be759105988263d5e72ae69aba9023;p=squirrelmail.git

diff --git a/src/compose.php b/src/compose.php
index cc73869c..a76e7e65 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * compose.php
  *
@@ -33,22 +32,16 @@ require_once(SM_PATH . 'functions/forms.php');
 require_once(SM_PATH . 'functions/identity.php');
 
 /* --------------------- Get globals ------------------------------------- */
-/** COOKIE VARS */
-sqgetGlobalVar('key',       $key,           SQ_COOKIE);
 
 /** SESSION VARS */
-sqgetGlobalVar('username',  $username,      SQ_SESSION);
-sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
-sqgetGlobalVar('base_uri',  $base_uri,      SQ_SESSION);
 sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
 
 sqgetGlobalVar('composesession',    $composesession,    SQ_SESSION);
 sqgetGlobalVar('compose_messages',  $compose_messages,  SQ_SESSION);
 sqgetGlobalVar('delayed_errors',  $delayed_errors,  SQ_SESSION);
-if (is_array($delayed_errors)) {
-    $oErrorHandler->AssignDelayedErrors($delayed_errors);
-    sqsession_unregister("delayed_errors");
-}
+
+// Turn on delayed error handling in case we wind up redirecting below
+$oErrorHandler->setDelayedErrors(true);
 
 /** SESSION/POST/GET VARS */
 sqgetGlobalVar('session',$session);
@@ -85,13 +78,14 @@ if ( sqgetGlobalVar('startMessage',$startMessage) ) {
 
 
 /** POST VARS */
-sqgetGlobalVar('sigappend',             $sigappend,             SQ_POST);
-sqgetGlobalVar('from_htmladdr_search',  $from_htmladdr_search,  SQ_POST);
-sqgetGlobalVar('addr_search_done',      $html_addr_search_done, SQ_POST);
-sqgetGlobalVar('send_to_search',        $send_to_search,        SQ_POST);
-sqgetGlobalVar('do_delete',             $do_delete,             SQ_POST);
-sqgetGlobalVar('delete',                $delete,                SQ_POST);
-sqgetGlobalVar('restoremessages',       $restoremessages,       SQ_POST);
+sqgetGlobalVar('sigappend',             $sigappend,                 SQ_POST);
+sqgetGlobalVar('from_htmladdr_search',  $from_htmladdr_search,      SQ_POST);
+sqgetGlobalVar('addr_search_done',      $html_addr_search_done,     SQ_POST);
+sqgetGlobalVar('addr_search_cancel',    $html_addr_search_cancel,   SQ_POST);
+sqgetGlobalVar('send_to_search',        $send_to_search,            SQ_POST);
+sqgetGlobalVar('do_delete',             $do_delete,                 SQ_POST);
+sqgetGlobalVar('delete',                $delete,                    SQ_POST);
+sqgetGlobalVar('restoremessages',       $restoremessages,           SQ_POST);
 if ( sqgetGlobalVar('return', $temp, SQ_POST) ) {
     $html_addr_search_done = 'Use Addresses';
 }
@@ -295,13 +289,19 @@ if (sqsession_is_registered('session_expired_post')) {
         sqsession_unregister('session_expired_post');
         session_write_close();
     } else {
-        foreach ($session_expired_post as $postvar => $val) {
-            if (isset($val)) {
-                $$postvar = $val;
-            } else {
-                $$postvar = '';
+        // these are the vars that we can set from the expired composed session   
+        $compo_var_list = array ( 'send_to', 'send_to_cc','body','startMessage',
+            'passed_body','use_signature','signature','attachments','subject','newmail',
+            'send_to_bcc', 'passed_id', 'mailbox', 'from_htmladdr_search', 'identity',
+            'draft_id', 'delete_draft', 'mailprio', 'edit_as_new', 'compose_messsages',
+            'composesession', 'request_mdn', 'request_dr');
+
+        foreach ($compo_var_list as $var) {
+            if ( isset($session_expired_post[$var]) && !isset($$var) ) {
+               $$var = $session_expired_post[$var];
             }
         }
+
         $compose_messages = unserialize(urldecode($restoremessages));
         sqsession_register($compose_messages,'compose_messages');
         sqsession_register($composesession,'composesession');
@@ -376,7 +376,7 @@ if ($draft) {
         $draft_message = _("Draft Email Saved");
         /* If this is a resumed draft, then delete the original */
         if(isset($delete_draft)) {
-            $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false);
+            $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, false);
             sqimap_mailbox_select($imap_stream, $draft_folder);
             // force bypass_trash=true because message should be saved when deliverMessage() returns true.
             // in current implementation of sqimap_msgs_list_flag() single message id can
@@ -387,10 +387,10 @@ if ($draft) {
             }
             sqimap_logout($imap_stream);
         }
-        if (count($oErrorHandler->aErrors)) {
-            sqsession_register($oErrorHandler->aErrors,"delayed_errors");
-        }
+        
+        $oErrorHandler->saveDelayedErrors();
         session_write_close();
+
         if ($compose_new_win == '1') {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
                 Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
@@ -475,7 +475,7 @@ if ($send) {
 
         /* if it is resumed draft, delete draft message */
         if ( isset($delete_draft)) {
-            $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false);
+            $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, false);
             sqimap_mailbox_select($imap_stream, $draft_folder);
             // bypass_trash=true because message should be saved when deliverMessage() returns true.
             // in current implementation of sqimap_msgs_list_flag() single message id can
@@ -489,10 +489,9 @@ if ($send) {
         /*
          * Store the error array in the session because they will be lost on a redirect
          */
-        if (count($oErrorHandler->aErrors)) {
-            sqsession_register($oErrorHandler->aErrors,"delayed_errors");
-        }
+        $oErrorHandler->saveDelayedErrors();
         session_write_close();
+
         if ($compose_new_win == '1') {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
                 Header("Location: $location/compose.php?mail_sent=yes");
@@ -560,7 +559,7 @@ if ($send) {
         }
     }
     showInputForm($session);
-} elseif (isset($html_addr_search)) {
+} elseif (isset($html_addr_search) && !isset($html_addr_search_cancel)) {
     if (isset($_FILES['attachfile']) &&
             $_FILES['attachfile']['tmp_name'] &&
             $_FILES['attachfile']['tmp_name'] != 'none') {
@@ -681,8 +680,9 @@ function getforwardSubject($subject)
 function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
     global $editor_size, $default_use_priority, $body, $idents,
         $use_signature, $data_dir, $username,
-        $username, $key, $imapServerAddress, $imapPort, $compose_messages,
-        $composeMessage, $body_quote;
+        $key, $imapServerAddress, $imapPort, $compose_messages,
+        $composeMessage, $body_quote, $request_mdn, $request_dr,
+        $default_use_mdn, $mdn_user_support;
     global $languages, $squirrelmail_language, $default_charset;
 
     /*
@@ -696,7 +696,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
     $mailprio = 3;
 
     if ($passed_id) {
-        $imapConnection = sqimap_login($username, $key, $imapServerAddress,
+        $imapConnection = sqimap_login($username, false, $imapServerAddress,
                 $imapPort, 0);
 
         sqimap_mailbox_select($imapConnection, $mailbox);
@@ -737,7 +737,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
             $type1 = $msg->type1;
             $unencoded_bodypart = mime_fetch_body($imapConnection, $passed_id, $ent);
             $body_part_entity = $message->getEntity($ent);
-            $bodypart = decodeBody($unencoded_bodypart,
+            $bodypart = decodeBody($unencoded_bodypart, 
                     $body_part_entity->header->encoding);
             if ($type1 == 'html') {
                 $bodypart = str_replace("\n", ' ', $bodypart);
@@ -826,6 +826,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
                     }
                 }
                 $subject = decodeHeader($orig_header->subject,false,false,true);
+                
+                // Remember the receipt settings
+                $request_mdn = $mdn_user_support && !empty($orig_header->dnt) ? '1' : '0';
+                $request_dr = $mdn_user_support && !empty($orig_header->drnt) ? '1' : '0';
+                
                 /* remember the references and in-reply-to headers in case of an reply */
                 $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references;
                 $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to;
@@ -1035,8 +1040,8 @@ function showInputForm ($session, $values=false) {
         $from_htmladdr_search, $location_of_buttons, $attachment_dir,
         $username, $data_dir, $identity, $idents, $delete_draft,
         $mailprio, $compose_new_win, $saved_draft, $mail_sent, $sig_first,
-        $username, $compose_messages, $composesession, $default_charset,
-        $compose_onsubmit, $oTemplate;
+        $compose_messages, $composesession, $default_charset,
+        $compose_onsubmit, $oTemplate, $oErrorHandler;
 
     if (checkForJavascript()) {
         $onfocus = ' onfocus="alreadyFocused=true;"';
@@ -1125,90 +1130,45 @@ function showInputForm ($session, $values=false) {
     }
 
     if ($saved_draft == 'yes') {
-        echo '<br /><div style="text-align: center;"><b>'. _("Draft Saved").'</div></b>';
+        $oTemplate->assign('note', _("Draft Saved"));
+        $oTemplate->display('note.tpl');
     }
     if ($mail_sent == 'yes') {
-        echo '<br /><div style="text-align: center;"><b>'. _("Your Message has been sent.").'</div></b>';
+        $oTemplate->assign('note', _("Your message has been sent."));
+        $oTemplate->display('note.tpl');
     }
     if ($compose_new_win == '1') {
-        echo '<table align="center" bgcolor="'.$color[0].'" width="100%" border="0">'."\n" .
-            '   <tr><td></td>'.html_tag( 'td', '', 'right' ).
-            '<input type="button" name="Close" onclick="return self.close()" value="'.
-            _("Close").'" /></td></tr>'."\n";
-    } else {
-        echo '<table align="center" cellspacing="0" border="0">' . "\n";
+        $oTemplate->display('compose_newwin_close.tpl');
     }
+    
     if ($location_of_buttons == 'top') {
         showComposeButtonRow();
     }
 
-    /* display select list for identities */
+    $identities = array();
     if (count($idents) > 1) {
-        $ident_list = array();
+        reset($idents);
         foreach($idents as $id => $data) {
-            $ident_list[$id] =
-                $data['full_name'].' <'.$data['email_address'].'>';
+            $identities[$id] = $data['full_name'].' &lt;'.$data['email_address'].'&gt;';
         }
-        echo '   <tr>' . "\n" .
-            html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
-            _("From:") . '</td>' . "\n" .
-            html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
-            '         '.
-            addSelect('identity', $ident_list, $identity, TRUE);
-
-        echo '      </td>' . "\n" .
-            '   </tr>' . "\n";
-    }
-
-    echo '   <tr>' . "\n" .
-        html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
-        _("To") . ':</td>' . "\n" .
-        html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
-        addInput('send_to', $send_to, 60, 0, $onfocus_array). '<br />' . "\n" .
-        '      </td>' . "\n" .
-        '   </tr>' . "\n" .
-        '   <tr>' . "\n" .
-        html_tag( 'td', '', 'right', $color[4] ) .
-        _("Cc") . ':</td>' . "\n" .
-        html_tag( 'td', '', 'left', $color[4] ) .
-        addInput('send_to_cc', $send_to_cc, 60, 0, $onfocus_array). '<br />' . "\n" .
-        '      </td>' . "\n" .
-        '   </tr>' . "\n" .
-        '   <tr>' . "\n" .
-        html_tag( 'td', '', 'right', $color[4] ) .
-        _("Bcc") . ':</td>' . "\n" .
-        html_tag( 'td', '', 'left', $color[4] ) .
-        addInput('send_to_bcc', $send_to_bcc, 60, 0, $onfocus_array).'<br />' . "\n" .
-        '      </td>' . "\n" .
-        '   </tr>' . "\n" .
-        '   <tr>' . "\n" .
-        html_tag( 'td', '', 'right', $color[4] ) .
-        _("Subject") . ':</td>' . "\n" .
-        html_tag( 'td', '', 'left', $color[4] ) . "\n";
-    echo '         '.addInput('subject', $subject, 60, 0, $onfocus_array).
-        '      </td>' . "\n" .
-        '   </tr>' . "\n\n";
+    }
+    
+    $oTemplate->assign('identities', $identities);
+    $oTemplate->assign('identity_def', $identity);
+    $oTemplate->assign('input_onfocus', 'onfocus="'.join(' ', $onfocus_array).'"');
+    
+    $oTemplate->assign('to', htmlspecialchars($send_to));
+    $oTemplate->assign('cc', htmlspecialchars($send_to_cc));
+    $oTemplate->assign('bcc', htmlspecialchars($send_to_bcc));
+    $oTemplate->assign('subject', htmlspecialchars($subject));
+        
+    $oTemplate->display('compose_header.tpl');
 
     if ($location_of_buttons == 'between') {
         showComposeButtonRow();
     }
 
-    /**
-     * When message is compose in new window, different colors are used.
-     */
-    if ($compose_new_win == '1') {
-        echo '   <tr>' . "\n" .
-            '      <td bgcolor="' . $color[0] . '" colspan="2" align="center">' . "\n" .
-            '         <textarea name="body" id="body" rows="' . (int)$editor_height .
-            '" cols="' . (int)$editor_size . '"' . $onfocus . '>';
-    }
-    else {
-        echo '   <tr>' . "\n" .
-            '      <td bgcolor="' . $color[4] . '" colspan="2">' . "\n" .
-            '         &nbsp;&nbsp;<textarea name="body" id="body" rows="' . (int)$editor_height .
-            '" cols="' . (int)$editor_size . '"' . $onfocus . '>';
-    }
-
+    $body_str = '';
     if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
         $signature = $idents[$identity]['signature'];
 
@@ -1220,38 +1180,34 @@ function showInputForm ($session, $values=false) {
              * issues too.
              */
             if ($default_charset == 'iso-2022-jp') {
-                echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
+                $body_str = "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
             } else {
-                echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
+                $body_str = "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
             }
-            echo "\n\n".htmlspecialchars(decodeHeader($body,false,false));
-        }
-        else {
-            echo "\n\n".htmlspecialchars(decodeHeader($body,false,false));
+            $body_str .= "\n\n".htmlspecialchars(decodeHeader($body,false,false));
+        } else {
+            $body_str = "\n\n".htmlspecialchars(decodeHeader($body,false,false));
             // FIXME: test is specific to ja_JP translation implementation. See above comments.
             if ($default_charset == 'iso-2022-jp') {
-                echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
-            }else{
-                echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
+                $body_str .= "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
+            } else {
+                $body_str .= "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
             }
         }
     } else {
-        echo htmlspecialchars(decodeHeader($body,false,false));
+        $body_str = htmlspecialchars(decodeHeader($body,false,false));
     }
-    echo '</textarea><br />' . "\n" .
-        '      </td>' . "\n" .
-        '   </tr>' . "\n";
-
 
+    $oTemplate->assign('editor_width', (int)$editor_size);
+    $oTemplate->assign('editor_height', (int)$editor_height);
+    $oTemplate->assign('input_onfocus', 'onfocus="'.join(' ', $onfocus_array).'"');
+    $oTemplate->assign('body', $body_str);
+    $oTemplate->assign('show_bottom_send', $location_of_buttons!='bottom');
+    
+    $oTemplate->display ('compose_body.tpl');
+    
     if ($location_of_buttons == 'bottom') {
         showComposeButtonRow();
-    } else {
-        echo '   <tr>' . "\n" .
-            html_tag( 'td', '', 'right', '', 'colspan="2"' ) . "\n" .
-            '         ' . addSubmit(_("Send"), 'send').
-            '         &nbsp;&nbsp;&nbsp;&nbsp;<br /><br />' . "\n" .
-            '      </td>' . "\n" .
-            '   </tr>' . "\n";
     }
 
     /* This code is for attachments */
@@ -1272,32 +1228,7 @@ function showInputForm ($session, $values=false) {
             }
         }
 
-        if(count($sizes) > 0) {
-            $maxsize = '(max.&nbsp;' . show_readable_size( min( $sizes ) ) . ')'
-                . addHidden('MAX_FILE_SIZE', min( $sizes ));
-        } else {
-            $maxsize = '';
-        }
-        echo '   <tr>' . "\n" .
-            '      <td colspan="2">' . "\n" .
-            '         <table width="100%" cellpadding="1" cellspacing="0" align="center"'.
-            ' border="0" bgcolor="'.$color[9].'">' . "\n" .
-            '            <tr>' . "\n" .
-            '               <td>' . "\n" .
-            '                 <table width="100%" cellpadding="3" cellspacing="0" align="center"'.
-            ' border="0">' . "\n" .
-            '                    <tr>' . "\n" .
-            html_tag( 'td', '', 'right', '', 'valign="middle"' ) .
-            _("Attach:") . '</td>' . "\n" .
-            html_tag( 'td', '', 'left', '', 'valign="middle"' ) .
-            '                          <input name="attachfile" size="48" type="file" />' . "\n" .
-            '                          &nbsp;&nbsp;<input type="submit" name="attach"' .
-            ' value="' . _("Add") .'" />' . "\n" .
-            $maxsize .
-            '                       </td>' . "\n" .
-            '                    </tr>' . "\n";
-
-        $s_a = array();
+        $attach = array();
         if ($composeMessage->entities) {
             foreach ($composeMessage->entities as $key => $attachment) {
                 $attached_file = $attachment->att_local_name;
@@ -1305,36 +1236,28 @@ function showInputForm ($session, $values=false) {
                     $attached_filename = decodeHeader($attachment->mime_header->getParameter('name'));
                     $type = $attachment->mime_header->type0.'/'.
                         $attachment->mime_header->type1;
-
-                    $s_a[] = '<table bgcolor="'.$color[0].
-                        '" border="0"><tr><td>'.
-                        addCheckBox('delete[]', FALSE, $key).
-                        "</td><td>\n" . $attached_filename .
-                        '</td><td>-</td><td> ' . $type . '</td><td>('.
-                        show_readable_size( filesize( $attached_file ) ) . ')</td></tr></table>'."\n";
+    
+                    $a = array();
+                    $a['Key'] = $key;
+                    $a['FileName'] = $attached_filename;
+                    $a['ContentType'] = $type;
+                    $a['Size'] = filesize($attached_file);
+                    $attach[$key] = $a;
                 }
             }
         }
-        if (count($s_a)) {
-            foreach ($s_a as $s) {
-                echo '<tr>' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .'</td></tr>';
-            }
-            echo '<tr><td colspan="2"><input type="submit" name="do_delete" value="' .
-                _("Delete selected attachments") . "\" />\n" .
-                '</td></tr>';
-        }
-        echo '                  </table>' . "\n" .
-            '               </td>' . "\n" .
-            '            </tr>' . "\n" .
-            '         </table>' . "\n" .
-            '      </td>' . "\n" .
-            '   </tr>' . "\n";
+    
+        $max = min($sizes);
+        $oTemplate->assign('max_file_size', empty($max) ? -1 : $max);
+        $oTemplate->assign('attachments', $attach);
+        
+        $oTemplate->display('compose_attachments.tpl');
     } // End of file_uploads if-block
     /* End of attachment code */
-    echo '</table>' . "\n" .
-        addHidden('username', $username).
-        addHidden('smaction', $action).
-        addHidden('mailbox', $mailbox);
+
+    echo addHidden('username', $username).
+         addHidden('smaction', $action).
+         addHidden('mailbox', $mailbox);
     /*
        store the complete ComposeMessages array in a hidden input value
        so we can restore them in case of a session timeout.
@@ -1353,6 +1276,12 @@ function showInputForm ($session, $values=false) {
     }
 
     do_hook('compose_bottom');
+
+    if ($compose_new_win=='1') {
+        $oTemplate->display('compose_newwin_close.tpl');
+    }
+    
+    $oErrorHandler->setDelayedErrors(false);
     $oTemplate->display('footer.tpl');
 }
 
@@ -1363,36 +1292,20 @@ function showComposeButtonRow() {
         $request_mdn, $request_dr,
         $data_dir, $username;
 
-    echo '   <tr>' . "\n" .
-        '      <td></td>' . "\n" .
-        '      <td>' . "\n";
-    if ($default_use_priority) {
-        if(!isset($mailprio)) {
-            $mailprio = '3';
-        }
-        echo '          ' . _("Priority") .
-            addSelect('mailprio', array(
-                        '1' => _("High"),
-                        '3' => _("Normal"),
-                        '5' => _("Low") ), $mailprio, TRUE);
+    global $oTemplate, $buffer_hook;
+    
+    if ($default_use_priority) {    
+        $priorities = array('1'=>_("High"), '3'=>_("Normal"), '5'=>_("Low"));
+        $priority = isset($mailprio) ? $mailprio : 3;
+    } else {
+        $priorities = array();
+        $priority = NULL;
     }
+    
     $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
-    if ($default_use_mdn) {
-        if ($mdn_user_support) {
-            echo '          ' . _("Receipt") .': '.
-                addCheckBox('request_mdn', $request_mdn == '1', '1'). _("On Read").
-                addCheckBox('request_dr',  $request_dr  == '1', '1'). _("On Delivery");
-        }
-    }
 
-    echo '      </td>' . "\n" .
-        '   </tr>' . "\n" .
-        '   <tr>'  . "\n" .
-        '      <td></td>' . "\n" .
-        '      <td>' . "\n" .
-        '         <input type="submit" name="sigappend" value="' . _("Signature") . '" />' . "\n";
     if ($use_javascript_addr_book) {
-        echo "         <script type=\"text/javascript\"><!--\n document.write(\"".
+        $addr_book = "         <script type=\"text/javascript\"><!--\n document.write(\"".
             "            <input type=button value=\\\""._("Addresses").
             "\\\" onclick=\\\"javascript:open_abook();\\\" />\");".
             "            // --></script><noscript>\n".
@@ -1400,19 +1313,22 @@ function showComposeButtonRow() {
             _("Addresses").'" />'.
             "         </noscript>\n";
     } else {
-        echo '         <input type="submit" name="html_addr_search" value="'.
+        $addr_book = '         <input type="submit" name="html_addr_search" value="'.
             _("Addresses").'" />' . "\n";
     }
 
-    if ($save_as_draft) {
-        echo '         <input type="submit" name ="draft" value="' . _("Save Draft") . "\" />\n";
-    }
-
-    echo '         <input type="submit" name="send" value="'. _("Send") . '" />' . "\n";
-    do_hook('compose_button_row');
+    $oTemplate->assign('allow_priority', $default_use_priority==1);
+    $oTemplate->assign('priority_list', $priorities);
+    $oTemplate->assign('current_priority', $priority);
+    
+    $oTemplate->assign('notifications_enabled', $mdn_user_support==1);
+    $oTemplate->assign('read_receipt', $request_mdn=='1');
+    $oTemplate->assign('delivery_receipt', $request_dr=='1');
+    
+    $oTemplate->assign('drafts_enabled', $save_as_draft);
+    $oTemplate->assign('address_book_button', $addr_book);
 
-    echo '      </td>' . "\n" .
-        '   </tr>' . "\n\n";
+    $oTemplate->display('compose_buttons.tpl');
 }
 
 function checkInput ($show) {
@@ -1422,7 +1338,7 @@ function checkInput ($show) {
      * using $show=false, and then when i'm ready to display the error
      * message, show=true
      */
-    global $body, $send_to, $send_to_bcc, $subject, $color;
+    global $send_to, $send_to_bcc;
 
     if ($send_to == '' && $send_to_bcc == '') {
         if ($show) {
@@ -1563,11 +1479,17 @@ function deliverMessage($composeMessage, $draft=false) {
     /* Receipt: On Read */
     if (isset($request_mdn) && $request_mdn) {
         $rfc822_header->dnt = $rfc822_header->parseAddress($from_mail,true);
+    } elseif (isset($rfc822_header->dnt)) {
+        unset($rfc822_header->dnt);
     }
+    
     /* Receipt: On Delivery */
     if (isset($request_dr) && $request_dr) {
         $rfc822_header->more_headers['Return-Receipt-To'] = $from_mail;
+    } elseif (isset($rfc822_header->more_headers['Return-Receipt-To'])) {
+        unset($rfc822_header->more_headers['Return-Receipt-To']);
     }
+
     /* multipart messages */
     if (count($composeMessage->entities)) {
         $message_body = new Message();
@@ -1601,7 +1523,7 @@ function deliverMessage($composeMessage, $draft=false) {
 
     $rfc822_header->content_type = $content_type;
     $composeMessage->rfc822_header = $rfc822_header;
-
+    
     /* Here you can modify the message structure just before we hand
        it over to deliver */
     $hookReturn = do_hook('compose_send', $composeMessage);
@@ -1622,12 +1544,20 @@ function deliverMessage($composeMessage, $draft=false) {
     } elseif (!$draft) {
         require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
         global $sendmail_path, $sendmail_args;
+        // Check for outdated configuration
+        if (!isset($sendmail_args)) {
+            if ($sendmail_path=='/var/qmail/bin/qmail-inject') {
+                $sendmail_args = '';
+            } else {
+                $sendmail_args = '-i -t';
+            }
+        }
         $deliver = new Deliver_SendMail(array('sendmail_args'=>$sendmail_args));
         $stream = $deliver->initStream($composeMessage,$sendmail_path);
     } elseif ($draft) {
         global $draft_folder;
         require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
-        $imap_stream = sqimap_login($username, $key, $imapServerAddress,
+        $imap_stream = sqimap_login($username, false, $imapServerAddress,
                 $imapPort, 0);
         if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
             require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
@@ -1665,7 +1595,7 @@ function deliverMessage($composeMessage, $draft=false) {
     } else {
         unset ($deliver);
         $move_to_sent = getPref($data_dir,$username,'move_to_sent');
-        $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+        $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
 
         /* Move to sent code */
         if (isset($default_move_to_sent) && ($default_move_to_sent != 0)) {