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

Move the Hour Format setting from Folders (???) to Display preferences.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8746 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/include/options/compose.php b/include/options/compose.php
index 2f8f8c82b49da3f68d7c0b5f6909f912224e6b31..7132ed7ed706995602d9d7178ed27f365a86a68b 100644 (file)
--- a/include/options/compose.php
+++ b/include/options/compose.php
@@ -14,6 +14,7 @@
 
 /** Define the group constants for this options page. */
 define('SMOPT_GRP_GENERAL', 0);
+define('SMOPT_GRP_REPLY', 1);
 
 /**
  * This function builds an array with all the information about
@@ -39,7 +40,7 @@ function load_optpage_data_compose() {
     /******************************************************/
     
     /*** Load the General Options into the array ***/
-    $optgrps[SMOPT_GRP_GENERAL] = _("Message Composition");
+    $optgrps[SMOPT_GRP_GENERAL] = _("General Message Composition");
     $optvals[SMOPT_GRP_GENERAL] = array();
 
     $optvals[SMOPT_GRP_GENERAL][] = array(
@@ -78,19 +79,6 @@ function load_optpage_data_compose() {
                            '0' => _("HTML"))
     );
     
-    $optvals[SMOPT_GRP_GENERAL][] = array(
-        'name'    => 'forward_cc',
-        'caption' => _("Include CCs when Forwarding Messages"),
-        'type'    => SMOPT_TYPE_BOOLEAN,
-        'refresh' => SMOPT_REFRESH_NONE
-    );
-
-    $optvals[SMOPT_GRP_GENERAL][] = array(
-        'name'    => 'include_self_reply_all',
-        'caption' => _("Include Me in CC when I Reply All"),
-        'type'    => SMOPT_TYPE_BOOLEAN,
-        'refresh' => SMOPT_REFRESH_NONE
-    );
     
     $optvals[SMOPT_GRP_GENERAL][] = array(
         'name'    => 'compose_new_win',
@@ -115,14 +103,33 @@ function load_optpage_data_compose() {
         'size'    => SMOPT_SIZE_TINY
     );
 
-    $optvals[SMOPT_GRP_GENERAL][] = array(
+    
+    /*** Load the General Options into the array ***/
+    $optgrps[SMOPT_GRP_REPLY] = _("Replying and Forwarding Messages");
+    $optvals[SMOPT_GRP_REPLY] = array();
+    
+    $optvals[SMOPT_GRP_REPLY][] = array(
+        'name'    => 'forward_cc',
+        'caption' => _("Include CCs when Forwarding Messages"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_REPLY][] = array(
+        'name'    => 'include_self_reply_all',
+        'caption' => _("Include Me in CC when I Reply All"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+    
+    $optvals[SMOPT_GRP_REPLY][] = array(
         'name'    => 'sig_first',
         'caption' => _("Append Signature before Reply/Forward Text"),
         'type'    => SMOPT_TYPE_BOOLEAN,
         'refresh' => SMOPT_REFRESH_NONE
     );
 
-    $optvals[SMOPT_GRP_GENERAL][] = array(
+    $optvals[SMOPT_GRP_REPLY][] = array(
         'name'    => 'body_quote',
         'caption' => _("Prefix for Original Message when Replying"),
         'type'    => SMOPT_TYPE_STRING,
@@ -131,7 +138,7 @@ function load_optpage_data_compose() {
         'save'    => 'save_option_reply_prefix'
     );
 
-    $optvals[SMOPT_GRP_GENERAL][] = array(
+    $optvals[SMOPT_GRP_REPLY][] = array(
         'name'    => 'reply_focus',
         'caption' => _("Cursor Position when Replying"),
         'type'    => SMOPT_TYPE_STRLIST,
@@ -142,7 +149,7 @@ function load_optpage_data_compose() {
                            'none' => _("No focus"))
     );
 
-    $optvals[SMOPT_GRP_GENERAL][] = array(
+    $optvals[SMOPT_GRP_REPLY][] = array(
         'name'    => 'strip_sigs',
         'caption' => _("Strip signature when replying"),
         'type'    => SMOPT_TYPE_BOOLEAN,

diff --git a/include/options/display.php b/include/options/display.php
index 92d4c995c8bab36bd3ab949c3e912da63ae40e1a..1d5c6d2375474f86b073ac2875e7f30d8a933921 100644 (file)
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -169,6 +169,15 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE
         //'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");

diff --git a/include/options/folder.php b/include/options/folder.php
index ea9c2b5e8ab45c87521bf373b3a9365ea99a80d0..f4b5624a6a7136002462ce749afe0b55e9d322f6 100644 (file)
--- a/include/options/folder.php
+++ b/include/options/folder.php
@@ -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"),
@@ -296,4 +287,4 @@ function save_option_draft_folder($option) {
     save_option($option);
 }
 
-?>
\ No newline at end of file
+?>