Missing var

[squirrelmail.git] / functions / options.php

diff --git a/functions/options.php b/functions/options.php
index bebd3a1929b97bb12fd65c4a6f2cec4be2121c0f..67c3c132ac378c7562aaf716aa5043fb693b4100 100644 (file)
--- a/functions/options.php
+++ b/functions/options.php
@@ -18,7 +18,7 @@
 /* Define constants for the various option types. */
 define('SMOPT_TYPE_STRING', 0);
 define('SMOPT_TYPE_STRLIST', 1);
-define('SMOPT_TYPE_textarea', 2);
+define('SMOPT_TYPE_TEXTAREA', 2);
 define('SMOPT_TYPE_INTEGER', 3);
 define('SMOPT_TYPE_FLOAT', 4);
 define('SMOPT_TYPE_BOOLEAN', 5);
@@ -90,8 +90,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 = '';
         }
@@ -145,7 +145,7 @@ class SquirrelOption {
             case SMOPT_TYPE_STRLIST:
                 $result = $this->createWidget_StrList();
                 break;
-            case SMOPT_TYPE_textarea:
+            case SMOPT_TYPE_TEXTAREA:
                 $result = $this->createWidget_TextArea();
                 break;
             case SMOPT_TYPE_INTEGER:
@@ -294,11 +294,13 @@ class SquirrelOption {
 }
 
 function save_option($option) {
-    global $data_dir, $username;
-    setPref($data_dir, $username, $option->name, $option->new_value);
+    if ( (float)substr(PHP_VERSION,0,3) < 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) {