moving main color tags to css

[squirrelmail.git] / include / options / display.php

diff --git a/include/options/display.php b/include/options/display.php
index 31c5122f67e4ff46571417d37275dbf9dc76cae2..904339d1400a812863cd756ef869ff05bce37da2 100644 (file)
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -3,11 +3,10 @@
 /**
  * options_display.php
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Displays all optinos about display preferences
  *
+ * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
@@ -50,9 +49,9 @@ if (! isset($use_iframe)) $use_iframe=false;
  * @return array all option information
  */
 function load_optpage_data_display() {
-    global $theme, $language, $languages,
+    global $theme, $fontsets, $language, $languages,
     $default_use_mdn, $squirrelmail_language, $allow_thread_sort,
-    $show_alternative_names, $available_languages, $use_icons, $use_iframe;
+    $show_alternative_names, $use_icons, $use_iframe;
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
@@ -94,6 +93,7 @@ function load_optpage_data_display() {
         closedir($handle);
     }
 
+    /*
     if ( count( $css_values ) > 1 ) {
 
         $optvals[SMOPT_GRP_GENERAL][] = array(
@@ -105,43 +105,57 @@ function load_optpage_data_display() {
         );
 
     }
+    */
+
+    $fontset_values = array();
+    foreach (array_keys($fontsets) as $fontset_key) {
+        $fontset_list[$fontset_key]=$fontset_key;
+    }
+    ksort($fontset_list);
 
-    // config.php can be unupdated.
-    if (! isset($available_languages) || $available_languages=="" ) {
-     $available_languages="ALL"; }
+    if (count($fontset_list) > 1) {
+        $fontset_list = array_merge(array('' => _("Default font style")), $fontset_list);
+        $optvals[SMOPT_GRP_GENERAL][] = array(
+            'name'    => 'chosen_fontset',
+            'caption' => _("Font style"),
+            'type'    => SMOPT_TYPE_STRLIST,
+            'refresh' => SMOPT_REFRESH_ALL,
+            'posvals' => $fontset_list
+        );
+    }
+
+    $optvals[SMOPT_GRP_GENERAL][] = array(
+        'name'    => 'chosen_fontsize',
+        'caption' => _("Font size"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_ALL,
+        'posvals' => array('' => _("Default font size"),
+                           '8' => '8 px',
+                           '10' => '10 px',
+                           '12' => '12 px',
+                           '14' => '14 px')
+    );
 
     $language_values = array();
-    if ( strtoupper($available_languages)=='ALL') {
-        foreach ($languages as $lang_key => $lang_attributes) {
-            if (isset($lang_attributes['NAME'])) {
-                $language_values[$lang_key] = $lang_attributes['NAME'];
-                if ( isset($show_alternative_names) &&
-                     $show_alternative_names &&
-                     isset($lang_attributes['ALTNAME']) ) {
-                    $language_values[$lang_key] .= " / " . $lang_attributes['ALTNAME'];
-                }
-            }
-        }
-    } else if (strtoupper($available_languages)!='NONE') {
-        // admin can set list of available languages in config
-        $available_languages_array=explode (" ",$available_languages);
-        foreach ($available_languages_array as $lang_key ) {
-            if (isset($languages[$lang_key]['NAME'])) {
-                $language_values[$lang_key] = $languages[$lang_key]['NAME'];
-                if ( isset($show_alternative_names) &&
-                     $show_alternative_names &&
-                     isset($languages[$lang_key]['ALTNAME']) ) {
-                    $language_values[$lang_key] .= " / " . $languages[$lang_key]['ALTNAME'];
-                }
+    foreach ($languages as $lang_key => $lang_attributes) {
+        if (isset($lang_attributes['NAME'])) {
+            $language_values[$lang_key] = $lang_attributes['NAME'];
+            if ( isset($show_alternative_names) &&
+                 $show_alternative_names &&
+                 isset($lang_attributes['ALTNAME']) ) {
+                $language_values[$lang_key] .= " / " . $lang_attributes['ALTNAME'];
             }
         }
     }
+
     asort($language_values);
     $language_values =
         array_merge(array('' => _("Default")), $language_values);
     $language = $squirrelmail_language;
-    if (strtoupper($available_languages)!='NONE') {
-        // if set to 'none', interface will use only default language
+
+    // add language selection only when more than 2 languages are available 
+    // (default, English and some other)
+    if (count($language_values)>2) {
         $optvals[SMOPT_GRP_GENERAL][] = array(
             'name'    => 'language',
             'caption' => _("Language"),
@@ -149,7 +163,7 @@ function load_optpage_data_display() {
             'refresh' => SMOPT_REFRESH_ALL,
             'posvals' => $language_values,
             'htmlencoded' => true
-            );
+        );
     }
 
     /* Set values for the "use javascript" option. */