X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Flistcommands%2Fmailout.php;h=d0181f0289b456f3445f70a1eaea495933761642;hb=30460a05016c7e066ad7b28df7788539e4054a99;hp=97e71c1be36be7f5f16eece3ec3c751235cd714e;hpb=73ee43b174ceb16e6143d0c8feb512e53eee3042;p=squirrelmail.git diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php index 97e71c1b..d0181f02 100644 --- a/plugins/listcommands/mailout.php +++ b/plugins/listcommands/mailout.php @@ -1,86 +1,64 @@ -

- - -
' . _("Mailinglist") . ' ' . _($action); ?>
-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 '

' . _("From:"); - -$idents = getPref($data_dir, $username, 'identities'); -if ($idents != '' && $idents > 1) -{ - echo ' ' . "\n" ; +$oTemplate->display('plugins/listcommands/mailout.tpl'); +$oTemplate->display('footer.tpl'); -} -else -{ - echo $defaultmail; -} -?> -
- - - - -">

-
-
-

- - \ No newline at end of file