X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_personal.php;h=34a7695d030a04bd3a7e7b062ccf821fe003c7e6;hb=8a2e4d5b2bf13cea37d09a958ed22ae626306df2;hp=495ba5730adc2cd3621077865b2deae139a52d17;hpb=d7d3c4d435ff1820555e557fcccc9a9d52bf9e93;p=squirrelmail.git

diff --git a/src/options_personal.php b/src/options_personal.php
index 495ba573..34a7695d 100644
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -7,82 +7,163 @@
     **
     **  Displays all options relating to personal information
     **
+    **  $Id$
     **/
 
-   session_start();
-
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($display_messages_php))
-      include("../functions/display_messages.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($i18n_php))
-      include("../functions/i18n.php");
-   if (!isset($plugin_php))
-      include("../functions/plugin.php");
-
-   include("../src/load_prefs.php");
-   displayPageHeader($color, "None");
-
-   $fullname = getPref($data_dir, $username, "full_name");
-   $replyto = getPref($data_dir, $username, "reply_to");
-   $email_address  = getPref($data_dir, $username, "email_address"); 
+   require_once('../src/validate.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.php');
+   require_once('../functions/plugin.php');
+   require_once('../functions/options.php');
+   
+   displayPageHeader($color, 'None');
+
+   $full_name = getPref($data_dir, $username, 'full_name');
+   $reply_to = getPref($data_dir, $username, 'reply_to');
+   $email_address  = getPref($data_dir, $username, 'email_address'); 
 
 ?>
    <br>
-   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
-      <center><b><?php echo _("Options") . " - " . _("Personal Information"); ?></b></center>
-   </td></tr></table>
-
-   <form name=f action="options.php" method=post>
-      <table width=100% cellpadding=0 cellspacing=2 border=0>
-         <tr>
-            <td align=right nowrap><?php echo _("Full Name"); ?>:
-            </td><td>
-               <input size=50 type=text value="<?php echo $fullname ?>" name=full_name> 
-            </td>
-         </tr>
-         <tr>
-            <td align=right nowrap><?php echo _("E-Mail Address"); ?>:
-            </td><td>
-               <input size=50 type=text value="<?php echo $email_address ?>" name=email_address> 
-            </td>
-         </tr>
-         <tr>
-            <td align=right nowrap><?php echo _("Reply To"); ?>:
-            </td><td>
-               <input size=50 type=text value="<?php echo $replyto ?>" name=reply_to> 
-            </td>
-         </tr>
-         <tr>
-            <td align=right nowrap valign=top><br><?php echo _("Signature"); ?>:
-            </td><td>
+<table width=95% align=center border=0 cellpadding=2 cellspacing=0>
+<tr><td align="center" bgcolor="<?php echo $color[0] ?>">
+
+      <b><?php echo _("Options") . " - " . _("Personal Information"); ?></b>
+
+    <table width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
+
+   <form name=f action="options.php" method=post><br>
+      <table width=100% cellpadding=2 cellspacing=0 border=0>
 <?php
-   if ($use_signature == true)
-      echo "<input type=checkbox value=\"0\" name=usesignature checked>&nbsp;&nbsp;" . _("Use a signature") . "?<BR>";
-   else {
-      echo "<input type=checkbox value=\"1\" name=usesignature>&nbsp;&nbsp;";
-      echo _("Use a signature?");
-      echo "<BR>";
-   } 
-   echo "\n<textarea name=signature_edit rows=5 cols=50>$signature_abs</textarea><br>";
+
+    /* Build a simple array into which we will build options. */
+    $optgrps = array();
+    $optvals = array();
+
+    /******************************************************/
+    /* LOAD EACH GROUP OF OPTIONS INTO THE OPTIONS ARRAY. */
+    /******************************************************/
+    define('SMOPT_GRP_CONTACT', 0);
+    define('SMOPT_GRP_REPLY', 1);
+    define('SMOPT_GRP_SIG', 2);
+
+    /*** Load the Contact Information Options into the array ***/
+    $optgrps[SMOPT_GRP_CONTACT] = _("Name and Address Options");
+    $optvals[SMOPT_GRP_CONTACT] = array();
+
+    /* Build a simple array into which we will build options. */
+    $optvals = array();
+
+    $optvals[SMOPT_GRP_CONTACT][] = array(
+        'name'    => 'full_name',
+        'caption' => _("Full Name"),
+        'type'    => SMOPT_TYPE_STRING,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_HUGE
+    );
+
+    $optvals[SMOPT_GRP_CONTACT][] = array(
+        'name'    => 'email_address',
+        'caption' => _("Email Address"),
+        'type'    => SMOPT_TYPE_STRING,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_HUGE
+    );
+
+    $optvals[SMOPT_GRP_CONTACT][] = array(
+        'name'    => 'reply_to',
+        'caption' => _("Reply To"),
+        'type'    => SMOPT_TYPE_STRING,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_HUGE
+    );
+
+    $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(
+        'name'    => 'reply_citation_style',
+        'caption' => _("Reply Citation Style"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => array(SMPREF_NONE    => _("No Citation"),
+                           'author_said'  => _("AUTHOR Said"),
+                           'quote_who'    => _("Quote Who XML"),
+                           'user-defined' => _("User-Defined"))
+    );
+
+    $optvals[SMOPT_GRP_REPLY][] = array(
+        'name'    => 'reply_citation_start',
+        'caption' => _("User-Defined Citation Start"),
+        'type'    => SMOPT_TYPE_STRING,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_MEDIUM
+    );
+
+    $optvals[SMOPT_GRP_REPLY][] = array(
+        'name'    => 'reply_citation_end',
+        'caption' => _("User-Defined Citation End"),
+        'type'    => SMOPT_TYPE_STRING,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_MEDIUM
+    );
+
+    /*** Load the Signature Options into the array ***/
+    $optgrps[SMOPT_GRP_SIG] = _("Signature Options");
+    $optvals[SMOPT_GRP_SIG] = array();
+
+    $optvals[SMOPT_GRP_SIG][] = array(
+        'name'    => 'use_signature',
+        'caption' => _("Use Signature"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_SIG][] = array(
+        'name'    => 'prefix_sig',
+        'caption' => _("Prefix Signature with '-- ' Line"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_SIG][] = array(
+        'name'    => 'signature_abs',
+        'caption' => _("Signature"),
+        'type'    => SMOPT_TYPE_TEXTAREA,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_MEDIUM
+    );
+
+    /* Build and output the option groups. */
+    $option_groups = createOptionGroups($optgrps, $optvals);
+    printOptionGroups($option_groups);
+
+    do_hook('options_personal_inside');
+    OptionSubmit( 'submit_personal' );
+
 ?>
-            </td>
-         </tr>
-         <tr>
-            <td>&nbsp;
-            </td><td>
-               <input type="submit" value="Submit" name="submit_personal">
-            </td>
-         </tr>
       </table>   
-   </form>
-   <?php do_hook("options_personal_bottom"); ?>
+</form>
+
+   <?php do_hook('options_personal_bottom'); ?>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
 </body></html>