X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_personal.php;h=c2a680bf2afb948c1af2a6a4d228ac1b7fbc0a50;hb=0954af91c12f492a35aee6f617feaeff628d60a8;hp=a97f790efb6c4eb9c5b8a3495ca53c21dfecca34;hpb=bbcafebdf79e848a696405cdb232e93c38d32fd6;p=squirrelmail.git

diff --git a/src/options_personal.php b/src/options_personal.php
index a97f790e..c2a680bf 100644
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -1,41 +1,33 @@
 <?php
-   /**
-    **  options_personal.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Displays all options relating to personal information
-    **
-    **  $Id$
-    **/
-
-   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 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
+/**
+ * options_personal.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Displays all options relating to personal information
+ *
+ * $Id$
+ */
+
+require_once('../functions/imap.php');
+require_once('../functions/array.php');
+ 
+/* Define the group constants for the personal options page. */
+define('SMOPT_GRP_CONTACT', 0);
+define('SMOPT_GRP_REPLY', 1);
+define('SMOPT_GRP_SIG', 2);
+
+/* Define the optpage load function for the personal options page. */
+function load_optpage_data_personal() {
+    global $data_dir, $username;
+    global $full_name, $reply_to, $email_address;
+
+    /* Set the values of some global variables. */
+    $full_name = getPref($data_dir, $username, 'full_name');
+    $reply_to = getPref($data_dir, $username, 'reply_to');
+    $email_address  = getPref($data_dir, $username, 'email_address'); 
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
@@ -44,10 +36,8 @@
     /******************************************************/
     /* LOAD EACH GROUP OF OPTIONS INTO THE OPTIONS ARRAY. */
     /******************************************************/
-    define('SMOPT_GRP_CONTACT', 0);
-    define('SMOPT_GRP_SIGNATURE', 1);
 
-    /*** 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 +68,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,56 +111,48 @@
         '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,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_MEDIUM
+        'size'    => SMOPT_SIZE_MEDIUM,
+        'save'    => 'save_option_signature'
     );
 
-    /* Build and output the option groups. */
-    $option_groups = createOptionGroups($optgrps, $optvals);
-    printOptionGroups($option_groups);
-
-    do_hook('options_personal_inside');
-    OptionSubmit( 'submit_personal' );
-
-?>
-      </table>   
-</form>
+    /* Assemble all this together and return it as our result. */
+    $result = array(
+        'grps' => $optgrps,
+        'vals' => $optvals
+    );
+    return ($result);
+}
 
-   <?php do_hook('options_personal_bottom'); ?>
+/******************************************************************/
+/** Define any specialized save functions for this option page. ***/
+/******************************************************************/
 
-    </td></tr>
-    </table>
+function save_option_signature($option) {
+    global $data_dir, $username;
+    setSig($data_dir, $username, $option->new_value);
+}
 
-</td></tr>
-</table>
-</body></html>
+?>