Improve HTML escaping

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

diff --git a/plugins/fortune/setup.php b/plugins/fortune/setup.php
index d3073e1a4dd16bf5a2e4ba52e9e281b90fc75666..dbdc7b109853f30650bddcb04eeeae6c1e908f75 100644 (file)
--- a/plugins/fortune/setup.php
+++ b/plugins/fortune/setup.php
@@ -3,17 +3,22 @@
 /**
  * plugins/fortune/setup.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Original code contributed by paulm@spider.org
  *
  * Simple SquirrelMail WebMail Plugin that displays the output of
  * fortune above the message listing.
  *
- * $Id$
+ * @copyright (c) 1999-2004 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage fortune
  */
 
+/**
+ * Init plugin
+ * @access private 
+ */
 function squirrelmail_plugin_init_fortune() {
   global $squirrelmail_plugin_hooks;
   
@@ -23,6 +28,10 @@ function squirrelmail_plugin_init_fortune() {
   $squirrelmail_plugin_hooks['loading_prefs']['fortune'] = 'fortune_load';  
 }
 
+/**
+ * Show fortune
+ * @access private 
+ */
 function fortune() {
     global $fortune_visible, $color;
 
@@ -32,38 +41,52 @@ function fortune() {
 
     $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>';
+    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.";
+        echo "$fortune_location" . _(" not found.");
     } else {
-        echo "<CENTER><FONT=3><EM>Today's Fortune</EM><BR></FONT></CENTER><pre>";
-        system($fortune_location);
+        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>';
+    echo '</pre></td></tr></table></td></tr></table></td></tr></table></center>';
 }
 
+/**
+ * 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
+ * @access private 
+ */
 function fortune_options() {
   global $fortune_visible;
 
-  echo "<tr><td align=right nowrap>Fortunes:</td>\n";
+  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";
+  echo " /> " . _("Show fortunes at top of mailbox") . "</td></tr>\n";
 }
 
+/**
+ * Save fortune prefs
+ * @access private 
+ */
 function fortune_save() {
     global $username,$data_dir;
 
-    if (isset($_POST['fortune_fortune_visible'])) {
+    if (sqgetGlobalVar('fortune_fortune_visible',$fortune_fortune_visible,SQ_POST)) {
         setPref($data_dir, $username, 'fortune_visible', '1');
     } else {
         setPref($data_dir, $username, 'fortune_visible', '');