X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Foptions%2Fdisplay.php;h=f7dfc0223725ec3064f04599853d8d4043f4c0c3;hp=039d5560ee7615032013be0af8c861e058097533;hb=407e70327abb65df0d3da60110eb27d477776898;hpb=299d1d03774287dd8c2e562d21a40cf7346d6600

diff --git a/include/options/display.php b/include/options/display.php
index 039d5560..f7dfc022 100644
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -73,15 +73,17 @@ function load_optpage_data_display() {
     }
     ksort($templateset_values);
     $templateset_values = array_flip($templateset_values);
-    $optvals[SMOPT_GRP_GENERAL][] = array(
-        'name'    => 'sTplDir',
-        'caption' => _("Template"),
-        'type'    => SMOPT_TYPE_STRLIST,
-        'refresh' => SMOPT_REFRESH_ALL,
-        'posvals' => $templateset_values,
-        'save'    => 'save_option_template'
-    );
-
+    // display template options only when there is more than one template
+    if (count($templateset_values)>1) {
+        $optvals[SMOPT_GRP_GENERAL][] = array(
+            'name'    => 'sTplDir',
+            'caption' => _("Template"),
+            'type'    => SMOPT_TYPE_STRLIST,
+            'refresh' => SMOPT_REFRESH_ALL,
+            'posvals' => $templateset_values,
+            'save'    => 'save_option_template'
+        );
+    }
 
     /* Load the theme option. */
     $theme_values = array();
@@ -126,10 +128,15 @@ function load_optpage_data_display() {
     */
 
     $fontset_values = array();
-    foreach (array_keys($fontsets) as $fontset_key) {
-        $fontset_list[$fontset_key]=$fontset_key;
+    $fontset_list = array();
+
+    if (!empty($fontsets) && is_array($fontsets)) {
+
+        foreach (array_keys($fontsets) as $fontset_key) {
+            $fontset_list[$fontset_key]=$fontset_key;
+        }
+        ksort($fontset_list);
     }
-    ksort($fontset_list);
 
     if (count($fontset_list) > 1) {
         $fontset_list = array_merge(array('' => _("Default font style")), $fontset_list);
@@ -214,6 +221,32 @@ function load_optpage_data_display() {
                            SMPREF_TIME_24HR => _("24-hour clock"))
     );
 
+    /* Icon theme selection */
+    if ($use_icons) {
+        global $icon_themes, $icon_theme;
+        
+        $temp = array();
+        for ($count = 0; $count < sizeof($icon_themes); $count++) {
+            $temp[$count] = $icon_themes[$count]['NAME'];
+            if ($icon_theme == $icon_themes[$count]['PATH'] ||
+                (($icon_theme == $sTplDir.'images/') && ($icon_themes[$count]['PATH']=='template'))
+               ) {
+                $value = $count;
+            }
+        }
+        if (sizeof($icon_themes) > 0) {
+            $optvals[SMOPT_GRP_GENERAL][] = array(
+                'name'          => 'icon_theme',
+                'caption'       => _("Icon Theme"),
+                'type'          => SMOPT_TYPE_STRLIST,
+                'refresh'       => SMOPT_REFRESH_NONE,
+                'posvals'       => $temp,
+                'initial_value' => $value,
+                'save'          => 'icon_theme_save'
+            );
+        }
+    }
+
     /*** Load the General Options into the array ***/
     $optgrps[SMOPT_GRP_MAILBOX] = _("Mailbox Display Options");
     $optvals[SMOPT_GRP_MAILBOX] = array();
@@ -240,27 +273,6 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE
     );
 
-    if ($use_icons) {
-        global $icon_themes, $icon_theme;
-        $temp = array();
-        for ($count = 0; $count < sizeof($icon_themes); $count++) {
-            $temp[$count] = $icon_themes[$count]['NAME'];
-            if ($icon_theme == $icon_themes[$count]['PATH'])
-                $value = $count;
-        }
-        if (sizeof($icon_themes) > 0) {
-            $optvals[SMOPT_GRP_MAILBOX][] = array(
-                'name'          => 'icon_theme',
-                'caption'       => _("Message Flags Icon Theme"),
-                'type'          => SMOPT_TYPE_STRLIST,
-                'refresh'       => SMOPT_REFRESH_NONE,
-                'posvals'       => $temp,
-                'initial_value' => $value,
-                'save'          => 'icon_theme_save'
-            );
-        }
-    }
-
     $optvals[SMOPT_GRP_MAILBOX][] = array(
         'name'    => 'show_flag_buttons',
         'caption' => _("Show Flag / Unflag Buttons"),
@@ -395,7 +407,7 @@ function load_optpage_data_display() {
 
     $optvals[SMOPT_GRP_MESSAGE][] = array(
         'name'    => 'delete_prev_next_display',
-        'caption' => _("Show 'Delete & Prev/Next' Links"),
+        'caption' => _("Show 'Delete &amp; Prev/Next' Links"),
         'type'    => SMOPT_TYPE_BOOLEAN,
         'refresh' => SMOPT_REFRESH_ALL
     );
@@ -485,4 +497,4 @@ function icon_theme_save($option) {
 
 }
 
-?>
\ No newline at end of file
+?>