Trimming whitespace and replacing tabs

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

diff --git a/include/options/display.php b/include/options/display.php
index 92d4c995c8bab36bd3ab949c3e912da63ae40e1a..31c5122f67e4ff46571417d37275dbf9dc76cae2 100644 (file)
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -33,6 +33,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 +52,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, $available_languages, $use_icons, $use_iframe;
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
@@ -170,13 +173,22 @@ function load_optpage_data_display() {
         //'post_script' => $js_autodetect_script,
     );
 
+    $optvals[SMOPT_GRP_GENERAL][] = array(
+        'name'    => 'hour_format',
+        'caption' => _("Hour Format"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_FOLDERLIST,
+        'posvals' => array(SMPREF_TIME_12HR => _("12-hour clock"),
+                           SMPREF_TIME_24HR => _("24-hour clock"))
+    );
+
     /*** Load the General Options into the array ***/
     $optgrps[SMOPT_GRP_MAILBOX] = _("Mailbox Display Options");
     $optvals[SMOPT_GRP_MAILBOX] = array();
 
     $optvals[SMOPT_GRP_MAILBOX][] = array(
         'name'    => 'show_num',
-        'caption' => _("Number of Messages on one Page"),
+        'caption' => _("Number of Messages per Page"),
         'type'    => SMOPT_TYPE_INTEGER,
         'refresh' => SMOPT_REFRESH_NONE,
         'size'    => SMOPT_SIZE_TINY
@@ -189,6 +201,13 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE
     );
 
+    $optvals[SMOPT_GRP_MAILBOX][] = array(
+        'name'    => 'fancy_index_highlite',
+        'caption' => _("Enable Fancy Row Mouseover Highlighting"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
     if ($use_icons) {
         global $icon_themes, $icon_theme;
         $temp = array();
@@ -261,7 +280,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"),
@@ -269,13 +289,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',
@@ -306,6 +321,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"),
@@ -355,9 +380,6 @@ function load_optpage_data_display() {
 /** Define any specialized save functions for this option page. ***/
 /******************************************************************/
 
-function save_option_header($option) {
-}
-
 /**
  * This function saves a new theme setting.
  * It updates the theme array.
@@ -408,20 +430,4 @@ function icon_theme_save($option) {
 
 }
 
-/**
- * This function saves the reply prefix (body_quote) character(s)
- */
-function save_option_reply_prefix($option) {
-
-    // save as "NONE" if it was blanked out
-    //
-    if (empty($option->new_value)) $option->new_value = 'NONE';
-
-
-    // Save the option like normal.
-    //
-    save_option($option);
-
-}
-
-?>
+?>
\ No newline at end of file