t12n of fortune output

plugins/fortune/functions.php

@@ -31,17 +31,12 @@ if (file_exists(SM_PATH . 'config/fortune_config.php')) {
  * @since 1.5.1
  */
 function fortune_function() {
-    global $fortune_visible, $color, $fortune_command;
+    global $oTemplate, $fortune_visible, $color, $fortune_command;
 
     if (!$fortune_visible) {
         return;
     }
 
-    echo "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" bgcolor=\"$color[10]\" align=\"center\">\n".
-        "<tr><td><table width=\"100%\" cellpadding=\"2\" cellspacing=\"1\" border=\"0\" bgcolor=\"$color[5]\">\n".
-        "<tr><td align=\"center\">\n";
-    echo '<table><tr><td>';
-
     /* open handle and get all command output*/
     $handle = popen($fortune_command,'r');
     $fortune = '';
@@ -53,11 +48,12 @@ function fortune_function() {
         // %s shows executed fortune cookie command.
         $fortune = sprintf(_("Unable to execute \"%s\"."),$fortune_command);
     }
-    echo "<div style=\"text-align: center;\"><em>" . _("Today's Fortune") . "</em></div><pre>\n" .
-            htmlspecialchars($fortune) .
-            "</pre>\n";
 
-    echo '</td></tr></table></td></tr></table></td></tr></table>';
+    $oTemplate->assign('color', $color);
+    $oTemplate->assign('fortune', htmlspecialchars($fortune));
+    $output = $oTemplate->fetch('plugins/fortune/mailbox_index_before.tpl');
+    return array('mailbox_index_before' => $output);
+
 }
 
 /**

plugins/fortune/setup.php

@@ -17,7 +17,7 @@
 function squirrelmail_plugin_init_fortune() {
     global $squirrelmail_plugin_hooks;
 
-    $squirrelmail_plugin_hooks['mailbox_index_before']['fortune'] = 'fortune';
+    $squirrelmail_plugin_hooks['template_construct_message_list.tpl']['fortune'] = 'fortune';
     $squirrelmail_plugin_hooks['loading_prefs']['fortune'] = 'fortune_load';
     $squirrelmail_plugin_hooks['optpage_loadhook_display']['fortune'] = 'fortune_options';
 }
@@ -28,7 +28,7 @@ function squirrelmail_plugin_init_fortune() {
  */
 function fortune() {
     include_once(SM_PATH . 'plugins/fortune/functions.php');
-    fortune_function();
+    return fortune_function();
 }
 
 /**

templates/default/plugins/fortune/mailbox_index_before.tpl

@@ -0,0 +1,47 @@
+<?php
+
+/**
+  * mailbox_index_before.tpl
+  *
+  * Template for outputting a fortune above the message 
+  * list for the fortune plugin.
+  *
+  * The following variables are available in this template:
+  *      + $color   - SquirrelMail colors array
+  *      + $fortune - The fortune string to be displayed
+  *
+  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+  * @version $Id$
+  * @package squirrelmail
+  * @subpackage plugins
+  */
+
+
+// retrieve the template vars
+//
+extract($t);
+
+
+?>
+<table cellpadding="0" cellspacing="0" border="0" bgcolor="<?php echo $color[10]; ?>" align="center">
+  <tr>
+    <td>
+      <table width="100%" cellpadding="2" cellspacing="1" border="0" bgcolor="$color[5]">
+        <tr>
+          <td align="center">
+            <table>
+              <tr>
+                <td>
+                  <div style="text-align: center;"><em><?php echo _("Today's Fortune"); ?></em></div>
+                  <pre>
+$fortune</pre>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>