From: thomppj <thomppj@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 14 Nov 2001 06:13:25 +0000 (+0000)
Subject: Small option changes.
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=8a2e4d5b2bf13cea37d09a958ed22ae626306df2;ds=sidebyside

Small option changes.


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

diff --git a/src/options_personal.php b/src/options_personal.php
index a97f790e..34a7695d 100644
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -45,9 +45,10 @@
     /* LOAD EACH GROUP OF OPTIONS INTO THE OPTIONS ARRAY. */
     /******************************************************/
     define('SMOPT_GRP_CONTACT', 0);
-    define('SMOPT_GRP_SIGNATURE', 1);
+    define('SMOPT_GRP_REPLY', 1);
+    define('SMOPT_GRP_SIG', 2);
 
-    /*** Load the General Options into the array ***/
+    /*** Load the Contact Information Options into the array ***/
     $optgrps[SMOPT_GRP_CONTACT] = _("Name and Address Options");
     $optvals[SMOPT_GRP_CONTACT] = array();
 
@@ -78,8 +79,20 @@
         'size'    => SMOPT_SIZE_HUGE
     );
 
-    /*** Load the General Options into the array ***/
-    $optgrps[SMOPT_GRP_REPLY] = _("Reply and Signature Options");
+    $identities_link_value = '<A HREF="options_identities.php">'
+                           . _("Edit Advanced Identities")
+                           . '</A> '
+                           . _("(discards changes made on this form so far)");
+    $optvals[SMOPT_GRP_CONTACT][] = array(
+        'name'    => 'identities_link',
+        'caption' => _("Multiple Identities"),
+        'type'    => SMOPT_TYPE_COMMENT,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'comment' =>  $identities_link_value
+    );
+
+    /*** Load the Reply Citation Options into the array ***/
+    $optgrps[SMOPT_GRP_REPLY] = _("Reply Citation Options");
     $optvals[SMOPT_GRP_REPLY] = array();
 
     $optvals[SMOPT_GRP_REPLY][] = array(
@@ -109,33 +122,25 @@
         'size'    => SMOPT_SIZE_MEDIUM
     );
 
-    $identities_link_value = '<A HREF="options_identities.php">'
-                           . _("Edit Advanced Identities")
-                           . '</A> '
-                           . _("(discards changes made on this form so far)");
-    $optvals[SMOPT_GRP_REPLY][] = array(
-        'name'    => 'identities_link',
-        'caption' => _("Multiple Identities"),
-        'type'    => SMOPT_TYPE_COMMENT,
-        'refresh' => SMOPT_REFRESH_NONE,
-        'comment' =>  $identities_link_value
-    );
+    /*** Load the Signature Options into the array ***/
+    $optgrps[SMOPT_GRP_SIG] = _("Signature Options");
+    $optvals[SMOPT_GRP_SIG] = array();
 
-    $optvals[SMOPT_GRP_REPLY][] = array(
+    $optvals[SMOPT_GRP_SIG][] = array(
         'name'    => 'use_signature',
         'caption' => _("Use Signature"),
         'type'    => SMOPT_TYPE_BOOLEAN,
         'refresh' => SMOPT_REFRESH_NONE
     );
 
-    $optvals[SMOPT_GRP_REPLY][] = array(
+    $optvals[SMOPT_GRP_SIG][] = array(
         'name'    => 'prefix_sig',
         'caption' => _("Prefix Signature with '-- ' Line"),
         'type'    => SMOPT_TYPE_BOOLEAN,
         'refresh' => SMOPT_REFRESH_NONE
     );
 
-    $optvals[SMOPT_GRP_REPLY][] = array(
+    $optvals[SMOPT_GRP_SIG][] = array(
         'name'    => 'signature_abs',
         'caption' => _("Signature"),
         'type'    => SMOPT_TYPE_TEXTAREA,