X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Foptions.php;h=67c3c132ac378c7562aaf716aa5043fb693b4100;hb=0b97a708e71c931153cd1ceee1495c9f4e1e209b;hp=959b92f1e581ddbfe9046dfc70bb208cb63719b3;hpb=bbcafebdf79e848a696405cdb232e93c38d32fd6;p=squirrelmail.git

diff --git a/functions/options.php b/functions/options.php
index 959b92f1..67c3c132 100644
--- a/functions/options.php
+++ b/functions/options.php
@@ -1,14 +1,15 @@
 <?php
-    /**
-     * options.php
-     *
-     * Copyright (c) 1999-2001 The Squirrelmail Development Team
-     * Licensed under the GNU GPL. For full terms see the file COPYING.
-     *
-     * Functions needed to display the options pages.
-     *
-     * $Id$
-     */
+
+/**
+ * options.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Functions needed to display the options pages.
+ *
+ * $Id$
+ */
 
 /**********************************************/
 /* Define constants used in the options code. */
@@ -35,6 +36,10 @@ define('SMOPT_SIZE_SMALL', 1);
 define('SMOPT_SIZE_MEDIUM', 2);
 define('SMOPT_SIZE_LARGE', 3);
 define('SMOPT_SIZE_HUGE', 4);
+define('SMOPT_SIZE_NORMAL', 5);
+
+define('SMOPT_SAVE_DEFAULT', 'save_option');
+define('SMOPT_SAVE_NOOP', 'save_option_noop');
 
 /**
  * SquirrelOption: An option for Squirrelmail.
@@ -55,17 +60,16 @@ class SquirrelOption {
     var $refresh_level;
     var $size;
     var $comment;
+    var $script;
+
+    /* The name of the Save Function for this option. */
+    var $save_function;
 
     /* The various 'values' for this options. */
     var $value;
     var $new_value;
     var $possible_values;
 
-    /* This variable needs to be made private so it can not be messed with. */
-    /* I just don't remember how to do it right now and think it would be   */
-    /* better to keep coding. Someone can fix it, if they want. Or I will.  */
-    var $changed;
-
     function SquirrelOption
     ($name, $caption, $type, $refresh_level, $possible_values = '') {
         /* Set the basic stuff. */
@@ -76,6 +80,7 @@ class SquirrelOption {
         $this->possible_values = $possible_values;
         $this->size = SMOPT_SIZE_MEDIUM;
         $this->comment = '';
+        $this->script = '';
 
         /* Check for a current value. */
         if (isset($GLOBALS[$name])) {
@@ -85,13 +90,28 @@ class SquirrelOption {
         }
 
         /* Check for a new value. */
-        if (isset($GLOBALS["new_$name"])) {
-            $this->new_value = $GLOBALS["new_$name"];
-            $this->changed = ($this->value !== $this->new_value);
+        if (isset($_POST["new_$name"])) {
+            $this->new_value = $_POST["new_$name"];
         } else {
             $this->new_value = '';
-            $this->changed = false;
         }
+
+        /* Set the default save function. */
+        if (($type != SMOPT_TYPE_HIDDEN) && ($type != SMOPT_TYPE_COMMENT)) {
+            $this->save_function = SMOPT_SAVE_DEFAULT;
+        } else {
+            $this->save_function = SMOPT_SAVE_NOOP;
+        }
+    }
+
+    /* Set the value for this option. */
+    function setValue($value) {
+        $this->value = $value;
+    }
+
+    /* Set the new value for this option. */
+    function setNewValue($new_value) {
+        $this->new_value = $new_value;
     }
 
     /* Set the size for this option. */
@@ -104,7 +124,20 @@ class SquirrelOption {
         $this->comment = $comment;
     }
 
+    /* Set the script for this option. */
+    function setScript($script) {
+        $this->script = $script;
+    }
+
+    /* Set the save function for this option. */
+    function setSaveFunction($save_function) {
+        $this->save_function = $save_function;
+    }
+
     function createHTMLWidget() {
+        global $javascript_on;
+
+        /* Get the widget for this option type. */
         switch ($this->type) {
             case SMOPT_TYPE_STRING:
                 $result = $this->createWidget_String();
@@ -131,52 +164,64 @@ class SquirrelOption {
                 $result = $this->createWidget_Comment();
                 break;
             default:
-               $result = '<FONT COLOR=RED>'
+               $result = '<font color="' . $color[2] . '">'
                        . sprintf(_("Option Type '%s' Not Found"), $this->type)
-                       . '</FONT>';
+                       . '</font>';
         }
 
+        /* Add the script for this option. */
+        $result .= $this->script;
+
         /* Now, return the created widget. */
         return ($result);
     }
 
     function createWidget_String() {
         switch ($this->size) {
-            case SMOPT_SIZE_TINY:  $width = 5; break;
-            case SMOPT_SIZE_SMALL: $width = 12; break;
-            case SMOPT_SIZE_LARGE: $width = 38; break;
-            case SMOPT_SIZE_HUGE:  $width = 50; break;
+            case SMOPT_SIZE_TINY:
+                $width = 5;
+                break;
+            case SMOPT_SIZE_SMALL:
+                $width = 12;
+                break;
+            case SMOPT_SIZE_LARGE:
+                $width = 38;
+                break;
+            case SMOPT_SIZE_HUGE:
+                $width = 50;
+                break;
             case SMOPT_SIZE_NORMAL:
-            default: $width = 25;
+            default:
+                $width = 25;
         }
 
-        $result = "<INPUT NAME=\"new_$this->name\" VALUE=\"$this->value\" SIZE=\"$width\">";
+        $result = "<input name=\"new_$this->name\" value=\"$this->value\" size=\"$width\">";
         return ($result);
     }
 
     function createWidget_StrList() {
         /* Begin the select tag. */
-        $result = "<SELECT NAME=\"new_$this->name\">";
+        $result = "<select name=\"new_$this->name\">";
 
         /* Add each possible value to the select list. */
         foreach ($this->possible_values as $real_value => $disp_value) {
             /* Start the next new option string. */
-            $new_option = "<OPTION VALUE=\"$real_value\"";
+            $new_option = "<option value=\"$real_value\"";
 
             /* If this value is the current value, select it. */
             if ($real_value == $this->value) {
-               $new_option .= ' SELECTED';
+               $new_option .= ' selected';
             }
 
             /* Add the display value to our option string. */
-            $new_option .= ">$disp_value</OPTION>";
+            $new_option .= ">$disp_value</option>";
 
             /* And add the new option string to our select tag. */
             $result .= $new_option;
         }
 
         /* Close the select tag and return our happy result. */
-        $result .= '</SELECT>';
+        $result .= '</select>';
         return ($result);
     }
 
@@ -189,8 +234,8 @@ class SquirrelOption {
             case SMOPT_SIZE_NORMAL:
             default: $rows = 5; $cols =  50;
         }
-        $result = "<TEXTAREA NAME=\"new_$this->name\" ROWS=\"$rows\" "
-                . "COLS=\"$cols\">$this->value</TEXTAREA>";
+        $result = "<textarea name=\"new_$this->name\" rows=\"$rows\" "
+                . "cols=\"$cols\">$this->value</textarea>";
         return ($result);
     }
 
@@ -205,21 +250,21 @@ class SquirrelOption {
     function createWidget_Boolean() {
         /* Do the whole current value thing. */
         if ($this->value != SMPREF_NO) {
-            $yes_chk = ' CHECKED';
+            $yes_chk = ' checked';
             $no_chk = '';
         } else {
             $yes_chk = '';
-            $no_chk = ' CHECKED';
+            $no_chk = ' checked';
         }
 
         /* Build the yes choice. */
-        $yes_option = '<INPUT TYPE="RADIO" NAME="new_' . $this->name
-                    . '" VALUE="' . SMPREF_YES . "\"$yes_chk>&nbsp;"
+        $yes_option = '<input type="radio" name="new_' . $this->name
+                    . '" value="' . SMPREF_YES . "\"$yes_chk>&nbsp;"
                     . _("Yes");
 
         /* Build the no choice. */
-        $no_option = '<INPUT TYPE="RADIO" NAME="new_' . $this->name
-                   . '" VALUE="' . SMPREF_NO . "\"$no_chk>&nbsp;"
+        $no_option = '<input type="radio" name="new_' . $this->name
+                   . '" value="' . SMPREF_NO . "\"$no_chk>&nbsp;"
                    . _("No");
 
         /* Build and return the combined "boolean widget". */
@@ -228,8 +273,8 @@ class SquirrelOption {
     }
 
     function createWidget_Hidden() {
-        $result = '<INPUT TYPE="HIDDEN" NAME="new_' . $this->name
-                . '" VALUE="' . $this->value . '">';
+        $result = '<input type="hidden" name="new_' . $this->name
+                . '" value="' . $this->value . '">';
         return ($result);
     }
 
@@ -238,12 +283,46 @@ class SquirrelOption {
         return ($result);
     }
 
-    function hasChanged() {
-        return ($this->changed);
+    function save() {
+        $function = $this->save_function;
+        $function($this);
     }
+
+    function changed() {
+        return ($this->value != $this->new_value);
+    }
+}
+
+function save_option($option) {
+    if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) {
+        global $_SESSION;
+    }
+    global $data_dir;
+    $username = $_SESSION['username'];
+
+    setPref($data_dir, $username, $option->name, $option->new_value);
+}
+
+function save_option_noop($option) {
+    /* Do nothing here... */
 }
 
-function createOptionGroups($optgrps, $optvals) {
+function create_optpage_element($optpage) {
+    return create_hidden_element('optpage', $optpage);
+}
+
+function create_optmode_element($optmode) {
+    return create_hidden_element('optmode', $optmode);
+}
+
+function create_hidden_element($name, $value) {
+    $result = '<input type="hidden" '
+            . 'name="' . $name . '" '
+            . 'value="' . $value . '">';
+    return ($result);
+}
+
+function create_option_groups($optgrps, $optvals) {
     /* Build a simple array with which to start. */
     $result = array();
 
@@ -286,6 +365,16 @@ function createOptionGroups($optgrps, $optvals) {
                 $next_option->setComment($optset['comment']);
             }
 
+            /* If provided, set the save function for this option. */
+            if (isset($optset['save'])) {
+                $next_option->setSaveFunction($optset['save']);
+            }
+
+            /* If provided, set the script for this option. */
+            if (isset($optset['script'])) {
+                $next_option->setScript($optset['script']);
+            }
+
             /* Add this option to the option array. */
             $result[$grpkey]['options'][] = $next_option;
         }
@@ -295,100 +384,42 @@ function createOptionGroups($optgrps, $optvals) {
     return ($result);
 }
 
-function printOptionGroups($option_groups) {
+function print_option_groups($option_groups) {
+    /* Print each option group. */
     foreach ($option_groups as $next_optgrp) {
-        echo '<TR><TD ALIGN="CENTER" VALIGN="MIDDLE" COLSPAN="2" NOWRAP><B>'
-           . $next_optgrp['name'] . "</B></TD></TR>\n";
+        /* If it is not blank, print the name for this option group. */
+        if ($next_optgrp['name'] != '') {
+            echo html_tag( 'tr', "\n".
+                        html_tag( 'td',
+                            '<b>' . $next_optgrp['name'] . '</b>' ,
+                        'center' ,'', 'valign="middle" colspan="2" nowrap' )
+                    ) ."\n";
+        }
+
+        /* Print each option in this option group. */
         foreach ($next_optgrp['options'] as $option) {
             if ($option->type != SMOPT_TYPE_HIDDEN) {
-                echo "<TR>\n";
-                echo '  <TD ALIGN="RIGHT" VALIGN="MIDDLE">'
-                   . $option->caption . ":</TD>\n";
-                echo '  <TD>' . $option->createHTMLWidget() . "</TD>\n";
-                echo "</TR>\n";
+                echo html_tag( 'tr', "\n".
+                           html_tag( 'td', $option->caption . ':', 'right' ,'', 'valign="middle"' ) .
+                           html_tag( 'td', $option->createHTMLWidget(), 'left' )
+                       ) ."\n";
             } else {
                 echo $option->createHTMLWidget();
             }
         }
-        echo "<TR><TD COLSPAN=\"2\">&nbsp;</TD></TR>\n";
-    }
-}
-
-function OptionSelect( $title, $name, $data, $default, $show = '', $store = '' ) {
 
-    echo "<tr><td align=right valign=middle nowrap>$title: </td><td>" .
-         "<select name=\"$name\">";
-    foreach( $data as $key => $opt ) {
-        if ( $store == '' ) {
-            $vl = $key;
-        } else{
-            $vl = $opt[$store];
-        }
-        if ( $show == '' ) {
-            $nm = $opt;
-        } else{
-            $nm = $opt[$show];
-        }
-        if ( $nm <> '') {
-            echo "<option value=\"$vl\"";
-            if( $vl == $default ) {
-                echo ' selected';
-            }
-            echo ">$nm</option>\n";
-        }
-    }
-    echo "</select></td></tr>\n";
-}
-
-function OptionRadio( $title, $name, $data, $default, $show = '', $store = '', $sep = '&nbsp; &nbsp;'  ) {
-    echo "<tr><td align=right valign=middle nowrap>$title: </td><td>";
-    foreach( $data as $key => $opt ) {
-        if ( $store == '' ) {
-            $vl = $key;
-        } else{
-            $vl = $opt[$store];
-        }
-        if ( $show == '' ) {
-            $nm = $opt;
-        } else{
-            $nm = $opt[$show];
-        }
-        if ( $nm <> '') {
-            echo "<input type=\"radio\" name=\"$name\" value=\"$vl\"";
-            if( $vl == $default ) {
-                echo ' checked';
-            }
-            echo ">$nm $sep\n";
-        }
+        /* Print an empty row after this option group. */
+        echo html_tag( 'tr',
+                   html_tag( 'td', '&nbsp;', 'left', '', 'colspan="2"' )
+                ) . "\n";
     }
-    echo "</td></tr>\n";
-}
-
-function OptionText( $title, $name, $value, $size ) {
-    echo "<tr><td align=right valign=middle nowrap>$title: </td><td>" .
-         "<input name=\"$name\" value=\"$value\" size=\"$size\">" .
-         "</td></tr>\n";
-}
-
-function OptionHidden( $name, $value ) {
-    echo "<INPUT TYPE=HIDDEN NAME=\"$name\" VALUE=\"$value\">\n";
-}
-
-function OptionCheck( $title, $name, $value, $comment ) {
-    if ( $value )
-        $chk = 'checked';
-    echo "<tr><td align=right valign=middle nowrap>$title: </td><td>" .
-         "<input type=\"checkbox\" name=\"$name\" $chk> $comment" .
-         "</td></tr>\n";
-}
-
-function OptionTitle( $title ) {
-    echo "<tr><td colspan=2 align=left valign=middle nowrap><b>$title</b></td></tr>\n";
 }
 
 function OptionSubmit( $name ) {
-    echo '<tr><td>&nbsp;</td><td><input type="submit" value="' . _("Submit") . '" name="' . $name . '">' .
-         '</td></tr>';
+        echo html_tag( 'tr',
+                   html_tag( 'td', '&nbsp;', 'left', '', 'colspan="2"' ) .
+                   html_tag( 'td', '<input type="submit" value="' . _("Submit") . '" name="' . $name . '">', 'left', '', 'colspan="2"' )
+                ) . "\n";
 }
 
 ?>