X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Foptions%2Fdisplay.php;h=cf7ef5f7b72f74933c1b2a9ebca8a92daeef5127;hp=40a35970606b64043fbe60d6e6996ad9697e840b;hb=c5c521a968c1cb9aa5b60f65216d79428f9cb3b9;hpb=18adc53f7043e7e0c06969685d91bf65dbcc6d14

diff --git a/include/options/display.php b/include/options/display.php
index 40a35970..cf7ef5f7 100644
--- 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
  */
@@ -33,6 +32,9 @@ if ($use_icons) {
     }
 }
 
+global $use_iframe;
+if (! isset($use_iframe)) $use_iframe=false;
+
 /**
  * This function builds an array with all the information about
  * the options available to the user, and returns it. The options
@@ -49,7 +51,7 @@ if ($use_icons) {
 function load_optpage_data_display() {
     global $theme, $language, $languages,
     $default_use_mdn, $squirrelmail_language, $allow_thread_sort,
-    $show_alternative_names, $available_languages, $use_icons;
+    $show_alternative_names, $use_icons, $use_iframe;
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
@@ -103,51 +105,32 @@ function load_optpage_data_display() {
 
     }
 
-    // config.php can be unupdated.
-    if (! isset($available_languages) || $available_languages=="" ) {
-     $available_languages="ALL"; }
-
     $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
-        $optvals[SMOPT_GRP_GENERAL][] = array(
-            'name'    => 'language',
-            'caption' => _("Language"),
-            'type'    => SMOPT_TYPE_STRLIST,
-            'refresh' => SMOPT_REFRESH_ALL,
-            'posvals' => $language_values,
-            'htmlencoded' => true
-            );
-    }
+
+    // TODO: maybe we can add count($language_values) check here
+    $optvals[SMOPT_GRP_GENERAL][] = array(
+        'name'    => 'language',
+        'caption' => _("Language"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_ALL,
+        'posvals' => $language_values,
+        'htmlencoded' => true
+    );
 
     /* Set values for the "use javascript" option. */
     $optvals[SMOPT_GRP_GENERAL][] = array(
@@ -277,7 +260,8 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE,
         'size'    => SMOPT_SIZE_TINY
     );
-
+/*
+  disabled because the template doesn't support it (yet?)
     $optvals[SMOPT_GRP_MAILBOX][] = array(
         'name'    => 'show_recipient_instead',
         'caption' => _("Show recipient name if the message is from your default identity"),
@@ -285,13 +269,8 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE,
         'size'    => SMOPT_SIZE_TINY
     );
+*/
 
-    $optvals[SMOPT_GRP_MAILBOX][] = array(
-        'name'    => 'internal_date_sort',
-        'caption' => _("Sort by Received Date"),
-        'type'    => SMOPT_TYPE_BOOLEAN,
-        'refresh' => SMOPT_REFRESH_ALL
-    );
     if ($allow_thread_sort == TRUE) {
         $optvals[SMOPT_GRP_MAILBOX][] = array(
             'name'    => 'sort_by_ref',
@@ -322,6 +301,16 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE
     );
 
+    if ($use_iframe) {
+        // Type is set to string in order to be able to use 100%.
+        $optvals[SMOPT_GRP_MESSAGE][] = array(
+            'name'    => 'iframe_height',
+            'caption' => _("Height of inline frame"),
+            'type'    => SMOPT_TYPE_STRING,
+            'size'    => SMOPT_SIZE_TINY,
+            'refresh' => SMOPT_REFRESH_NONE
+        );
+    }
     $optvals[SMOPT_GRP_MESSAGE][] = array(
         'name'    => 'enable_forward_as_attachment',
         'caption' => _("Enable Forward as Attachment"),
@@ -421,4 +410,4 @@ function icon_theme_save($option) {
 
 }
 
-?>
+?>
\ No newline at end of file