X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Foptions.php;h=5bdedadb0eee282d31ad0f8a576dba2f2091c4ad;hb=478e8b55a374012970ccb53c133ab5efdc182c56;hp=834ef3a1272ca39a72df2f58de3de0ca52c866a0;hpb=88cb1b4d2ebd3e74fcee1d756df4e420da8bdf09;p=squirrelmail.git

diff --git a/functions/options.php b/functions/options.php
index 834ef3a1..5bdedadb 100644
--- a/functions/options.php
+++ b/functions/options.php
@@ -24,6 +24,7 @@ define('SMOPT_TYPE_FLOAT', 4);
 define('SMOPT_TYPE_BOOLEAN', 5);
 define('SMOPT_TYPE_HIDDEN', 6);
 define('SMOPT_TYPE_COMMENT', 7);
+define('SMOPT_TYPE_FLDRLIST', 8);
 
 /* Define constants for the options refresh levels. */
 define('SMOPT_REFRESH_NONE', 0);
@@ -90,8 +91,8 @@ class SquirrelOption {
         }
 
         /* Check for a new value. */
-        if (isset($GLOBALS["new_$name"])) {
-            $this->new_value = $GLOBALS["new_$name"];
+        if (isset($_POST["new_$name"])) {
+            $this->new_value = $_POST["new_$name"];
         } else {
             $this->new_value = '';
         }
@@ -163,10 +164,13 @@ class SquirrelOption {
             case SMOPT_TYPE_COMMENT:
                 $result = $this->createWidget_Comment();
                 break;
+            case SMOPT_TYPE_FLDRLIST:
+                $result = $this->createWidget_FolderList();
+                break;
             default:
-               $result = '<FONT COLOR="' . $color[2] . '">'
+               $result = '<font color="' . $color[2] . '">'
                        . sprintf(_("Option Type '%s' Not Found"), $this->type)
-                       . '</FONT>';
+                       . '</font>';
         }
 
         /* Add the script for this option. */
@@ -195,36 +199,68 @@ class SquirrelOption {
                 $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);
     }
 
+    function createWidget_FolderList() {
+        $selected = array(strtolower($this->value));
+
+        /* Begin the select tag. */
+        $result = "<select name=\"new_$this->name\">";
+
+        /* Add each possible value to the select list. */
+        foreach ($this->possible_values as $real_value => $disp_value) {
+            if ( is_array($disp_value) ) { 
+              /* For folder list, we passed in the array of boxes.. */
+              $new_option = sqimap_mailbox_option_list(0, $selected, 0, $disp_value);
+            } else {
+              /* Start the next new option string. */
+              $new_option = "<option value=\"$real_value\"";
+  
+              /* If this value is the current value, select it. */
+              if ($real_value == $this->value) {
+                 $new_option .= ' selected';
+              }
+  
+              /* Add the display value to our option string. */
+              $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>';
+        return ($result);
+    }
+
+
     function createWidget_TextArea() {
         switch ($this->size) {
             case SMOPT_SIZE_TINY:  $rows = 3; $cols =  10; break;
@@ -234,8 +270,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);
     }
 
@@ -250,21 +286,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". */
@@ -273,8 +309,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);
     }
 
@@ -289,16 +325,18 @@ class SquirrelOption {
     }
 
     function changed() {
-        return ($this->value !== $this->new_value);
+        return ($this->value != $this->new_value);
     }
 }
 
 function save_option($option) {
-    global $data_dir, $username;
-    setPref($data_dir, $username, $option->name, $option->new_value);
+    if ( !check_php_version(4,1) ) {
+        global $_SESSION;
+    }
+    global $data_dir;
+    $username = $_SESSION['username'];
 
-    /* I do not know if this next line does any good. */
-    $GLOBALS[$option->name] = $option->new_value;
+    setPref($data_dir, $username, $option->name, $option->new_value);
 }
 
 function save_option_noop($option) {
@@ -314,9 +352,9 @@ function create_optmode_element($optmode) {
 }
 
 function create_hidden_element($name, $value) {
-    $result = '<INPUT TYPE="HIDDEN" '
-            . 'NAME="' . $name . '" '
-            . 'VALUE="' . $value . '">';
+    $result = '<input type="hidden" '
+            . 'name="' . $name . '" '
+            . 'value="' . $value . '">';
     return ($result);
 }
 
@@ -387,32 +425,37 @@ function print_option_groups($option_groups) {
     foreach ($option_groups as $next_optgrp) {
         /* If it is not blank, print the name for this option group. */
         if ($next_optgrp['name'] != '') {
-            echo '<TR><TD ALIGN=CENTER VALIGN=MIDDLE COLSPAN=2 NOWRAP><B>'
-               .   $next_optgrp['name']
-	       . "</B></TD></TR>\n";
-	}
-	
-	/* Print each option in this option group. */
+            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();
             }
         }
-	
-	/* Print an empty row after this option group. */
-        echo "<TR><TD COLSPAN=\"2\">&nbsp;</TD></TR>\n";
+
+        /* Print an empty row after this option group. */
+        echo html_tag( 'tr',
+                   html_tag( 'td', '&nbsp;', 'left', '', 'colspan="2"' )
+                ) . "\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";
 }
 
 ?>