X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_display.php;h=a47144063d00ea1c89c714be85887ca4abb5b6d3;hb=8e54a58ba05c72b8265b168df336ca048b571bed;hp=22a074dc552d0104fbb6be1a520126fbf753829b;hpb=8f1ba72b11a7c2ff9fd2613586007261e0b32798;p=squirrelmail.git

diff --git a/src/options_display.php b/src/options_display.php
index 22a074dc..a4714406 100644
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -18,7 +18,8 @@ define('SMOPT_GRP_MESSAGE', 2);
 
 /* Define the optpage load function for the display options page. */
 function load_optpage_data_display() {
-    global $theme, $language, $languages, $js_autodetect_results;
+    global $theme, $language, $languages, $js_autodetect_results,
+    $compose_new_win, $default_use_mdn, $squirrelmail_language, $allow_thread_sort;
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
@@ -49,21 +50,25 @@ function load_optpage_data_display() {
     );
  
     $css_values = array( 'none' => _("Default" ) );
-	$handle=opendir('../themes/css/');
-	while ($file = readdir($handle) ) {
-	    if ( substr( $file, -4 ) == '.css' ) {
-	        $css_values[$file] = substr( $file, 0, strlen( $file ) - 4 );
+    $handle=opendir('../themes/css/');
+    while ($file = readdir($handle) ) {
+        if ( substr( $file, -4 ) == '.css' ) {
+            $css_values[$file] = substr( $file, 0, strlen( $file ) - 4 );
         }
-	}	
-	closedir($handle);
+    }
+    closedir($handle);
     
-    $optvals[SMOPT_GRP_GENERAL][] = array(
-        'name'    => 'custom_css',
-        'caption' => _("Custom Stylesheet"),
-        'type'    => SMOPT_TYPE_STRLIST,
-        'refresh' => SMOPT_REFRESH_ALL,
-        'posvals' => $css_values
-    );
+    if ( count( $css_values > 1 ) ) {
+    
+        $optvals[SMOPT_GRP_GENERAL][] = array(
+            'name'    => 'custom_css',
+            'caption' => _("Custom Stylesheet"),
+            'type'    => SMOPT_TYPE_STRLIST,
+            'refresh' => SMOPT_REFRESH_ALL,
+            'posvals' => $css_values
+        );
+    
+    }
     
     $language_values = array();
     foreach ($languages as $lang_key => $lang_attributes) {
@@ -74,6 +79,7 @@ function load_optpage_data_display() {
     asort($language_values);
     $language_values =
         array_merge(array('' => _("Default")), $language_values);
+    $language = $squirrelmail_language;
     $optvals[SMOPT_GRP_GENERAL][] = array(
         'name'    => 'language',
         'caption' => _("Language"),
@@ -171,6 +177,7 @@ function load_optpage_data_display() {
                            SMPREF_LOC_BOTTOM  => _("After message body"))
     );
 
+
     $optvals[SMOPT_GRP_MESSAGE][] = array(
         'name'    => 'use_javascript_addr_book',
         'caption' => _("Addressbook Display Format"),
@@ -194,6 +201,13 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE
     );
 
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'forward_cc',
+        'caption' => _("Include CCs when forwarding messages"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
     $optvals[SMOPT_GRP_MESSAGE][] = array(
         'name'    => 'show_xmailer_default',
         'caption' => _("Enable Mailer Display"),
@@ -222,6 +236,59 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE
     );
 
+    if ($default_use_mdn) {
+        $optvals[SMOPT_GRP_MESSAGE][] = array(
+            'name'    => 'mdn_user_support',
+            'caption' => _("Enable request/confirm reading"),
+            'type'    => SMOPT_TYPE_BOOLEAN,
+            'refresh' => SMOPT_REFRESH_NONE
+        );
+    }
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'compose_new_win',
+        'caption' => _("Always compose in a new window"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_ALL
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'compose_width',
+        'caption' => _("Width of compose window"),
+        'type'    => SMOPT_TYPE_INTEGER,
+        'refresh' => SMOPT_REFRESH_ALL,
+        'size'    => SMOPT_SIZE_TINY
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'compose_height',
+        'caption' => _("Height of compose window"),
+        'type'    => SMOPT_TYPE_INTEGER,
+        'refresh' => SMOPT_REFRESH_ALL,
+        'size'    => SMOPT_SIZE_TINY
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'sig_first',
+        'caption' => _("Append signature before reply/forward text"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'internal_date_sort',
+        'caption' => _("Use receive date for sort"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_ALL
+    );
+    if ($allow_thread_sort == TRUE) {
+        $optvals[SMOPT_GRP_MESSAGE][] = array(
+            'name'    => 'sort_by_ref',
+            'caption' => _("Use References header for thread sort"),
+            'type'    => SMOPT_TYPE_BOOLEAN,
+            'refresh' => SMOPT_REFRESH_ALL
+        );
+    }
     /* Assemble all this together and return it as our result. */
     $result = array(
         'grps' => $optgrps,