Divide the Compose options screen in two sections: General and Forwarding/Replying.

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

diff --git a/include/options/folder.php b/include/options/folder.php
index 8ca1f09ce8f1aec37192caeefdac43507db32964..f4b5624a6a7136002462ce749afe0b55e9d322f6 100644 (file)
--- a/include/options/folder.php
+++ b/include/options/folder.php
@@ -3,7 +3,7 @@
 /**
  * options_folder.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Displays all options relating to folders
@@ -190,7 +190,7 @@ function load_optpage_data_folder() {
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_FOLDERLIST,
         'posvals' => array( '0' => _("International date and time"),
-                           '1' => _("American date and time"),
+                            '1' => _("American date and time"),
                             '2' => _("European date and time"),
                             '3' => _("Show weekday and time"),
                             '4' => _("Show time with seconds"),
@@ -198,15 +198,6 @@ function load_optpage_data_folder() {
                             '6' => _("No Clock")),
     );
 
-    $optvals[SMOPT_GRP_FOLDERLIST][] = 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"))
-    );
-
     $optvals[SMOPT_GRP_FOLDERLIST][] = array(
         'name'    => 'search_memory',
         'caption' => _("Memory Search"),
@@ -237,7 +228,8 @@ function load_optpage_data_folder() {
         'refresh' => SMOPT_REFRESH_NONE,
         'posvals' => array( 0 => _("Long: ") . '"' . _("Folder") . $delim . _("Subfolder") . '"',
                             1 => _("Indented: ") .  '"    ' . _("Subfolder") . '"',
-                            2 => _("Delimited: ") . '". ' . _("Subfolder") . '"')
+                            2 => _("Delimited: ") . '". ' . _("Subfolder") . '"'),
+        'htmlencoded' => true
     );
 
     /* Assemble all this together and return it as our result. */