Fix what seems to have been a copy/paste bug

[squirrelmail.git] / plugins / fortune / setup.php

diff --git a/plugins/fortune/setup.php b/plugins/fortune/setup.php
index 8e4e93c96d60b57ed49ae92f494e16e3e94175d4..f99f4e0c4c35aabb90383ae087d1021003748c9f 100644 (file)
--- a/plugins/fortune/setup.php
+++ b/plugins/fortune/setup.php
@@ -1,22 +1,13 @@
 <?php
 
 /**
- * plugins/fortune/setup.php
+ * Fortune plugin setup script
  *
- * Original code contributed by paulm@spider.org
- *
- * Simple SquirrelMail WebMail Plugin that displays the output of
- * fortune above the message listing.
- *
- * @copyright (c) 1999-2004 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 fortune
- *
- * FIXME
- * There should be no code in setup.php, just hook registrations. Create functions.php
- * and move the code there.
  */
 
 /**
@@ -24,77 +15,36 @@
  * @access private
  */
 function squirrelmail_plugin_init_fortune() {
-  global $squirrelmail_plugin_hooks;
+    global $squirrelmail_plugin_hooks;
 
-  $squirrelmail_plugin_hooks['mailbox_index_before']['fortune'] = 'fortune';
-  $squirrelmail_plugin_hooks['options_display_inside']['fortune'] = 'fortune_options';
-  $squirrelmail_plugin_hooks['options_display_save']['fortune'] = 'fortune_save';
-  $squirrelmail_plugin_hooks['loading_prefs']['fortune'] = 'fortune_load';
+    $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';
 }
 
 /**
- * Show fortune
+ * Call fortune display function
  * @access private
  */
 function fortune() {
-    global $fortune_visible, $color;
-
-    if (!$fortune_visible) {
-        return;
-    }
-
-    $fortune_location = '/usr/games/fortune';
-    $exist = file_exists($fortune_location);
-    echo "<center><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" bgcolor=\"$color[10]\">\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>';
-    if (!$exist) {
-        echo "$fortune_location" . _(" not found.");
-    } else {
-        echo "<center><em>" . _("Today's Fortune") . "</em><br /></font></center><pre>";
-        htmlspecialchars(system($fortune_location));
-    }
-
-    echo '</pre></td></tr></table></td></tr></table></td></tr></table></center>';
+    include_once(SM_PATH . 'plugins/fortune/functions.php');
+    return fortune_function();
 }
 
 /**
- * Get fortune prefs
- * @access private
- */
-function fortune_load() {
-    global $username, $data_dir, $fortune_visible;
-
-    $fortune_visible = getPref($data_dir, $username, 'fortune_visible');
-}
-
-/**
- * Add fortune options
+ * Call fortune option display function
  * @access private
  */
 function fortune_options() {
-    global $fortune_visible;
-
-    echo "<tr>" . html_tag('td',_("Fortunes:"),'right','','nowrap') . "\n";
-    echo '<td><input name="fortune_fortune_visible" type="checkbox"';
-    if ($fortune_visible)
-        echo ' checked="checked"';
-    echo " /> " . _("Show fortunes at top of mailbox") . "</td></tr>\n";
+    include_once(SM_PATH . 'plugins/fortune/functions.php');
+    fortune_function_options();
 }
 
 /**
- * Save fortune prefs
+ * Call fortune prefs load function
  * @access private
  */
-function fortune_save() {
-    global $username,$data_dir;
-
-    if (sqgetGlobalVar('fortune_fortune_visible',$fortune_fortune_visible,SQ_POST)) {
-        setPref($data_dir, $username, 'fortune_visible', '1');
-    } else {
-        setPref($data_dir, $username, 'fortune_visible', '');
-    }
+function fortune_load() {
+    include_once(SM_PATH . 'plugins/fortune/functions.php');
+    fortune_function_load();
 }
-
-?>