move HTML output to template, improve HTML on the fly

plugins/listcommands/mailout.php

@@ -28,7 +28,6 @@ sqgetGlobalVar('body',    $body,    SQ_GET);
 sqgetGlobalVar('action',  $action,  SQ_GET);
 
 displayPageHeader($color, $mailbox);
-$fieldsdescr = listcommands_fieldsdescr();
 
 switch ( $action ) {
     case 'help':
@@ -47,41 +46,19 @@ switch ( $action ) {
         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 />
-</form></td></tr></table></p></body></html>

plugins/listcommands/templates/default/mailout.tpl

@@ -0,0 +1,70 @@
+<?php
+
+/**
+  * mailout.tpl
+  *
+  * Template for listcommands (un)subscribe/help mail sending interface
+  *
+  * The following variables are available in this template:
+  *      + $ - The lists that the user currently has 
+  *                 configured (an array of list addresses, 
+  *                 keyed by an ID number)
+  *
+  * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+  * @version $Id$
+  * @package plugins
+  * @subpackage listcommands
+  */
+
+
+// retrieve the template vars
+//
+extract($t);
+
+
+?>
+
+<div class="dialogbox">
+<table class="wrapper">
+<tr><td class="header1"><?php echo _("Mailinglist") . ': ' . $fielddescr; ?></td></tr>
+
+<tr><td>
+<?php echo $out_string; ?>
+
+<br /><br />
+
+<form action="../../src/compose.php" method="post">
+
+<?php if (count($idents) > 1) {
+    echo '<label for="identity">' . _("From:") .'</label> ';
+    echo '<select name="identity" id="identity">';
+    
+    foreach($idents as $nr=>$data) {
+        echo '<option value="' . $nr . '">' .
+            htmlspecialchars(
+                    $data['full_name'].' <'.
+                    $data['email_address'] . '>') .
+            "</option>\n";		    
+    }
+
+    echo "</select>\n";
+
+} else {
+
+    echo _("From:");
+    echo htmlspecialchars($idents[0]['full_name'].' <'.$idents[0]['email_address'].'>');
+}
+?>
+<br /><br />
+<input type="hidden" name="send_to" value="<?php echo htmlspecialchars($send_to); ?>" />
+<input type="hidden" name="subject" value="<?php echo htmlspecialchars($subject); ?>" />
+<input type="hidden" name="body" value="<?php echo htmlspecialchars($body); ?>" />
+<input type="hidden" name="mailbox" value="<?php echo htmlspecialchars($mailbox); ?>" />
+<input type="submit" name="send" value="<?php echo _("Send Mail"); ?>" />
+<br />
+</form>
+
+</td></tr></table>
+</div>
+