X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Flistcommands%2Fmailout.php;h=ecba67dc6f179d961c87b8484eed671fc9209216;hp=666f96ee7cdb5c64e38d2215dd99b3b6d6b04784;hb=3ba5c6063eb9282838b862d4f206266d0034e905;hpb=b1379bdf5bd35c0d816bc0eedad43341403ba73f diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php index 666f96ee..ecba67dc 100644 --- a/plugins/listcommands/mailout.php +++ b/plugins/listcommands/mailout.php @@ -1,94 +1,64 @@ display('footer.tpl'); + exit; } -printf( $out_string, htmlspecialchars($send_to) ); +$out_string = sprintf($out_string, '"' . htmlspecialchars($send_to) . '"'); +$idents = get_identities(); +$fieldsdescr = listcommands_fieldsdescr(); +$fielddescr = $fieldsdescr[$action]; -echo '
'; +$oTemplate->assign('out_string', $out_string); +$oTemplate->assign('fielddescr', $fielddescr); +$oTemplate->assign('send_to', $send_to); +$oTemplate->assign('subject', $subject); +$oTemplate->assign('body', $body); +$oTemplate->assign('mailbox', $mailbox); +$oTemplate->assign('idents', $idents); -/* - * Identity support (RFC 2369 sect. B.1.) - * - * I had to copy this from compose.php because there doesn't - * seem to exist a function to get the identities. - */ - -$defaultmail = htmlspecialchars(getPref($data_dir, $username, 'full_name')); -$em = getPref($data_dir, $username, 'email_address'); -if ($em != '') { - $defaultmail .= htmlspecialchars(' <' . $em . '>') . "\n"; -} -echo html_tag('p', '', 'center' ) . _("From:") . ' '; - -$idents = getPref($data_dir, $username, 'identities'); -if ($idents != '' && $idents > 1) { - echo ' ' . "\n" ; - -} else { - echo $defaultmail; -} +$oTemplate->display('plugins/listcommands/mailout.tpl'); +$oTemplate->display('footer.tpl'); -echo '
' -. '' -. '' -. '' -. '' -. '

' -. '

'; -?>