Fixing several small bugs...

[squirrelmail.git] / src / options_display.php

diff --git a/src/options_display.php b/src/options_display.php
index c4da9aa21382a3665d14e96e7d65d85402a606c6..1ddaeb0cc58253c0e62b0ef079dac15c114d5bcd 100644 (file)
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -3,7 +3,7 @@
 /**
  * options_display.php
  *
- * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Displays all optinos about display preferences
@@ -18,7 +18,7 @@ define('SMOPT_GRP_MESSAGE', 2);
 
 /* Define the optpage load function for the display options page. */
 function load_optpage_data_display() {
-    global $theme, $languages, $js_autodetect_results;
+    global $theme, $language, $languages, $js_autodetect_results;
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
@@ -35,8 +35,10 @@ function load_optpage_data_display() {
     /* Load the theme option. */
     $theme_values = array();
     foreach ($theme as $theme_key => $theme_attributes) {
-        $theme_values[$theme_attributes['PATH']] = $theme_attributes['NAME'];
+        $theme_values[$theme_attributes['NAME']] = $theme_attributes['PATH'];
     }
+    ksort($theme_values);
+    $theme_values = array_flip($theme_values);
     $optvals[SMOPT_GRP_GENERAL][] = array(
         'name'    => 'chosen_theme',
         'caption' => _("Theme"),
@@ -46,12 +48,14 @@ function load_optpage_data_display() {
         'save'    => 'save_option_theme'
     );
 
+    $language = (!isset($language) || ($language == '') ? 'en' : $language);
     $language_values = array();
     foreach ($languages as $lang_key => $lang_attributes) {
         if (isset($lang_attributes['NAME'])) {
             $language_values[$lang_key] = $lang_attributes['NAME'];
         }
     }
+    asort($language_values);
     $optvals[SMOPT_GRP_GENERAL][] = array(
         'name'    => 'language',
         'caption' => _("Language"),