More options updated changes.

[squirrelmail.git] / src / options.php

diff --git a/src/options.php b/src/options.php
index bf0c796b46751cc8dc609d20cd900cb1053396f9..8b78c4914c8b36611c715879359d1fbb648e3662 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -66,58 +66,37 @@
       
         echo '<br><b>'._("Successfully saved personal information!").'</b><br>';
     } else if (isset($submit_display)) {
-        // Do checking to make sure $chosentheme is in the array
-        $in_ary = false;
+        /* Do checking to make sure $new_theme is in the array. */
+        $theme_in_array = false;
         for ($i=0; $i < count($theme); $i++) {
-            if ($theme[$i]['PATH'] == $chosentheme) {
-                $in_ary = true;
+            if ($theme[$i]['PATH'] == $new_chosen_theme) {
+                $theme_in_array = true;
                 break;
             }
         }
-        if (! $in_ary) {
-            $chosentheme = '';
+        if (!$theme_in_array) {
+            $new_chosen_theme = '';
         }
    
         /* Save display preferences. */
-        setPref($data_dir, $username, 'chosen_theme', $chosentheme);
-        setPref($data_dir, $username, 'language', $language);
-        setPref($data_dir, $username, 'use_javascript_addr_book', $javascript_abook);
+        setPref($data_dir, $username, 'chosen_theme', $new_chosen_theme);
+        setPref($data_dir, $username, 'language', $new_language);
+        setPref($data_dir, $username, 'use_javascript_addr_book', $new_use_javascript_addr_book);
         setPref($data_dir, $username, 'javascript_setting', $new_javascript_setting);
-        setPref($data_dir, $username, 'show_num', $shownum);
-        setPref($data_dir, $username, 'wrap_at', $wrapat);
-        setPref($data_dir, $username, 'editor_size', $editorsize);
-        setPref($data_dir, $username, 'left_refresh', $leftrefresh);
-        setPref($data_dir, $username, 'location_of_bar', $folder_new_location);
-        setPref($data_dir, $username, 'location_of_buttons', $button_new_location);
-        setPref($data_dir, $username, 'left_size', $leftsize);
-
-        if (isset($altIndexColors) && $altIndexColors == 1) {
-            setPref($data_dir, $username, 'alt_index_colors', 1);
-        } else {
-            setPref($data_dir, $username, 'alt_index_colors', 0);
-        }
-
-        setPref($data_dir, $username, 'show_html_default', ($showhtmldefault?1:0) );
-
-        if (isset($includeselfreplyall)) {
-            setPref($data_dir, $username, 'include_self_reply_all', 1);
-        } else {
-            removePref($data_dir, $username, 'include_self_reply_all');
-        }
-
-        if (isset($pageselectormax)) {
-            setPref($data_dir, $username, 'page_selector_max', $pageselectormax);
-        } else {
-            removePref($data_dir, $username, 'page_selector_max', 0 );
-        }
-
-        if (isset($pageselector)) {
-            removePref($data_dir, $username, 'page_selector');
-        } else {
-            setPref($data_dir, $username, 'page_selector', 1);
-        }
-
-        $js_autodetect_results = (isset($js_autodetect_results) ? $js_autodetect_results : SMPREF_JS_OFF);
+        setPref($data_dir, $username, 'show_num', $new_show_num);
+        setPref($data_dir, $username, 'wrap_at', $new_wrap_at);
+        setPref($data_dir, $username, 'editor_size', $new_editor_size);
+        setPref($data_dir, $username, 'location_of_buttons', $new_location_of_buttons);
+        setPref($data_dir, $username, 'location_of_bar', $new_location_of_bar);
+        setPref($data_dir, $username, 'left_size', $new_left_size);
+        setPref($data_dir, $username, 'left_refresh', $new_left_refresh);
+        setPref($data_dir, $username, 'alt_index_colors', $new_alt_index_colors);
+        setPref($data_dir, $username, 'show_html_default', $new_show_html_default);
+        setPref($data_dir, $username, 'include_self_reply_all', $new_include_self_reply_all);
+        setPref($data_dir, $username, 'page_selector', $new_page_selector);
+        setPref($data_dir, $username, 'page_selector_max', $new_page_selector_max);
+
+        $js_autodetect_results = (isset($new_js_autodetect_results) ? $new_js_autodetect_results : SMPREF_JS_OFF);
         if ($new_javascript_setting == SMPREF_JS_AUTODETECT) {
             if ($js_autodetect_results == SMPREF_JS_ON) {
                 setPref($data_dir, $username, 'javascript_on', SMPREF_JS_ON);
@@ -324,4 +303,4 @@
              "</table>\n";
     }
 
-?>
\ No newline at end of file
+?>