Use shell exec so we can escape the fortune output.

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

diff --git a/plugins/fortune/setup.php b/plugins/fortune/setup.php
index 92646e717da60502d76dc3fc6f45fc47cf968c96..67e3b7f17e7664a1a793670e273f41faa9872793 100644 (file)
--- a/plugins/fortune/setup.php
+++ b/plugins/fortune/setup.php
@@ -1,14 +1,8 @@
 <?php
-
 /**
- * plugins/fortune/setup.php
- *
- * Original code contributed by paulm@spider.org
+ * Fortune plugin setup script
  *
- * Simple SquirrelMail WebMail Plugin that displays the output of
- * fortune above the message listing.
- *
- * @copyright (c) 1999-2004 The SquirrelMail Project Team
+ * @copyright (c) 1999-2005 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
@@ -16,79 +10,49 @@
  */
 
 /**
- * Init plugin
- * @access private 
+ * If SM_PATH isn't defined, define it.
+ * @ignore
  */
-function squirrelmail_plugin_init_fortune() {
-  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';  
+if (!defined('SM_PATH'))  {
+    define('SM_PATH','../../');
 }
 
 /**
- * Show fortune
- * @access private 
+ * Init plugin
+ * @access private
  */
-function fortune() {
-    global $fortune_visible, $color;
-
-    if (!$fortune_visible) {
-        return;
-    }
+function squirrelmail_plugin_init_fortune() {
+    global $squirrelmail_plugin_hooks;
 
-    $fortune_location = '/usr/games/fortune';
-    $exist = file_exists($fortune_location);
-    echo "<center><table cellpadding=0 cellspacing=0 border=0 bgcolor=$color[10]><tr><td><table width=100% cellpadding=2 cellspacing=1 border=0 bgcolor=\"$color[5]\"><tr><td align=center>";
-    echo '<TABLE><TR><TD>';
-    if (!$exist) {
-        echo "$fortune_location" . _(" not found.");
-    } else {
-        echo "<CENTER><FONT=3><EM>" . _("Today's Fortune") . "</EM><BR></FONT></CENTER><pre>";
-        system($fortune_location);
-    } 
-  
-    echo '</pre></TD></TR></TABLE></td></tr></table></td></tr></table></center>';
+    $squirrelmail_plugin_hooks['mailbox_index_before']['fortune'] = 'fortune';
+    $squirrelmail_plugin_hooks['loading_prefs']['fortune'] = 'fortune_load';
+    $squirrelmail_plugin_hooks['optpage_loadhook_display']['fortune'] = 'fortune_options';
 }
 
 /**
- * Get fortune prefs
- * @access private 
+ * Call fortune display function
+ * @access private
  */
-function fortune_load() {
-    global $username, $data_dir, $fortune_visible;
-
-    $fortune_visible = getPref($data_dir, $username, 'fortune_visible');
+function fortune() {
+    include_once(SM_PATH . 'plugins/fortune/functions.php');
+    fortune_function();
 }
 
 /**
- * Add fortune options
- * @access private 
+ * 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';
-  echo " /> " . _("Show fortunes at top of mailbox") . "</td></tr>\n";
+    include_once(SM_PATH . 'plugins/fortune/functions.php');
+    fortune_function_options();
 }
 
 /**
- * Save fortune prefs
- * @access private 
+ * Call fortune prefs load function
+ * @access private
  */
-function fortune_save() {
-    global $username,$data_dir;
-
-    if (isset($_POST['fortune_fortune_visible'])) {
-        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();
 }
-
 ?>
\ No newline at end of file