X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Flistcommands%2Fmailout.php;h=3ce2007cc9fd0aad973f8eeba6419bbce061525d;hb=12ba9472f717849de39ad2648d2613f23a048077;hp=9a76fd3bd3a854723436b19a8a9faeeab86f1289;hpb=f265009a3bf872cf6c9d9aaefe7949e1688555a0;p=squirrelmail.git

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index 9a76fd3b..3ce2007c 100644
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -3,24 +3,22 @@
 /**
  * mailout.php
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2011 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
  * @subpackage listcommands
  */
-
-/** @ignore */
-define('SM_PATH','../../');
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+require('../../include/init.php');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-include_once(SM_PATH . 'functions/page_header.php');
-include_once(SM_PATH . 'include/load_prefs.php');
-include_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/identity.php');
-require_once(SM_PATH . 'functions/forms.php');
-include_once(SM_PATH . 'plugins/listcommands/functions.php');
+require(SM_PATH . 'functions/identity.php');
+require(SM_PATH . 'functions/forms.php');
+require(SM_PATH . 'plugins/listcommands/functions.php');
 
 /* get globals */
 sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
@@ -30,7 +28,6 @@ sqgetGlobalVar('body',    $body,    SQ_GET);
 sqgetGlobalVar('action',  $action,  SQ_GET);
 
 displayPageHeader($color, $mailbox);
-$fieldsdescr = listcommands_fieldsdescr();
 
 switch ( $action ) {
     case 'help':
@@ -43,45 +40,25 @@ switch ( $action ) {
         $out_string = _("This will send a message to %s requesting that you will be unsubscribed from this list. It will try to unsubscribe the adress below.");
         break;
     default:
-        error_box(sprintf(_("Unknown action: %s"),htmlspecialchars($action)), $color);
+        error_box(sprintf(_("Unknown action: %s"),htmlspecialchars($action)));
+        // display footer (closes html tags) and stop script execution
+        $oTemplate->display('footer.tpl');
         exit;
 }
 
-echo html_tag('p', '', 'left' ) .
-    html_tag( 'table', '', 'center', $color[0], 'border="0" width="75%"' ) . "\n" .
-    html_tag( 'tr',
-            html_tag( 'th', _("Mailinglist") . ': ' . $fieldsdescr[$action], '', $color[9] )
-            ) .
-    html_tag( 'tr' ) .
-    html_tag( 'td', '', 'left' );
-
-printf($out_string, '"' . htmlspecialchars($send_to) . '"');
-
-echo addForm(SM_PATH . 'src/compose.php', 'post');
-
+$out_string = sprintf($out_string, '"' . htmlspecialchars($send_to) . '"');
 $idents = get_identities();
+$fieldsdescr = listcommands_fieldsdescr();
+$fielddescr = $fieldsdescr[$action];
 
-echo html_tag('p', '', 'center' ) . _("From:") . ' ';
+$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);
 
-if (count($idents) > 1) {
-    echo '<select name="identity">';
-    foreach($idents as $nr=>$data) {
-        echo '<option value="' . $nr . '">' .
-            htmlspecialchars(
-                    $data['full_name'].' <'.
-                    $data['email_address'] . ">\n");
-    }
-    echo '</select>' . "\n" ;
-} else {
-    echo htmlspecialchars('"'.$idents[0]['full_name'].'" <'.$idents[0]['email_address'].'>');
-}
+$oTemplate->display('plugins/listcommands/mailout.tpl');
+$oTemplate->display('footer.tpl');
 
-echo '<br />' .
-    addHidden('send_to', $send_to) .
-    addHidden('subject', $subject) .
-    addHidden('body', $body) .
-    addHidden('mailbox', $mailbox) .
-    addSubmit(_("Send Mail"), 'send');
-?>
-<br /><br /></div>
-</form></td></tr></table></p></body></html>
\ No newline at end of file