X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Flistcommands%2Fmailout.php;h=9db99ae3e7567a60df463cdcdc60fc472b15579b;hp=5e6191212632f8cb92fb2e6e669c955d6c891405;hb=a15b73a49b070358cf1e8ec699911df67e58ef9e;hpb=c435f076fe6b5b58e09ae19a8e216f37b069d802

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index 5e619121..9db99ae3 100644
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -1,27 +1,24 @@
 <?php
+
 /**
  * mailout.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * $Id$
+ * @copyright 1999-2010 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');
-
-displayPageHeader($color, $mailbox);
+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,53 +27,38 @@ sqgetGlobalVar('subject', $subject, SQ_GET);
 sqgetGlobalVar('body',    $body,    SQ_GET);
 sqgetGlobalVar('action',  $action,  SQ_GET);
 
-echo html_tag('p', '', 'left' ) .
-html_tag( 'table', '', 'center', $color[0], 'border="0" width="75%"' ) . "\n" .
-    html_tag( 'tr',
-        html_tag( 'th', _("Mailinglist") . ' ' . _($action), '', $color[9] )
-    ) .
-    html_tag( 'tr' ) .
-    html_tag( 'td', '', 'left' );
+displayPageHeader($color, $mailbox);
 
 switch ( $action ) {
-case 'help':
-    $out_string = _("This will send a message to %s requesting help for this list. You will receive an emailed response at the address below.");
-    break;
-case 'subscribe':
-    $out_string = _("This will send a message to %s requesting that you will be subscribed to this list. You will be subscribed with the address below.");
-    break;
-case 'unsubscribe':
-    $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.");
+    case 'help':
+        $out_string = _("This will send a message to %s requesting help for this list. You will receive an emailed response at the address below.");
+        break;
+    case 'subscribe':
+        $out_string = _("This will send a message to %s requesting that you will be subscribed to this list. You will be subscribed with the address below.");
+        break;
+    case 'unsubscribe':
+        $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)));
+        // display footer (closes html tags) and stop script execution
+        $oTemplate->display('footer.tpl');
+        exit;
 }
 
-printf( $out_string, htmlspecialchars($send_to) );
-
-echo addForm('../../src/compose.php', 'post');
-
-
+$out_string = sprintf($out_string, '&quot;' . htmlspecialchars($send_to) . '&quot;');
 $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 /></center>'
-. '</form></td></tr></table></p></body></html>';
-?>
\ No newline at end of file