X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_personal.php;h=988ccb2c400b0b109d66927adde8f20dbffe311a;hp=62b62e4e80b29bd18cabfa87bb59313a99e12a3c;hb=5c3b0995850de5ec0702783f6c3f174b8001d090;hpb=d4e84069d1d9af8760b8e858672d3ea3d4eac8b0

diff --git a/src/options_personal.php b/src/options_personal.php
index 62b62e4e..988ccb2c 100644
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -1,98 +1,158 @@
 <?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$
-    **/
-
-   include('../src/validate.php');
-   include('../functions/display_messages.php');
-   include('../functions/imap.php');
-   include('../functions/array.php');
-   include('../functions/plugin.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'); 
+
+/**
+ * options_personal.php
+ *
+ * Copyright (c) 1999-2001 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('../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();
+    $optvals = array();
+
+    /******************************************************/
+    /* LOAD EACH GROUP OF OPTIONS INTO THE OPTIONS ARRAY. */
+    /******************************************************/
+
+    /*** 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,
+        'save'    => 'save_option_signature'
+    );
+
+    /* Assemble all this together and return it as our result. */
+    $result = array(
+        'grps' => $optgrps,
+        'vals' => $optvals
+    );
+    return ($result);
+}
+
+/******************************************************************/
+/** Define any specialized save functions for this option page. ***/
+/******************************************************************/
+
+function save_option_signature($option) {
+    global $data_dir, $username;
+    setSig($data_dir, $username, $option->new_value);
+}
 
 ?>
-   <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>
-         <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><?PHP echo _("Multiple Identities"); ?>:
-	    </td><td>
-	       <a href="options_identities.php">Edit Advanced Identities</a>
-               (discards changes made on this form so far)
-	    </td>
-	 </tr>
-         <tr><td colspan=2><hr size=1 width=80%></td></tr>
-         <tr>
-            <td align=right nowrap valign=top><br><?php echo _("Signature"); ?>:
-            </td><td>
-<?php
-   if ($use_signature == true)
-      echo '<input type=checkbox value="1" name=usesignature checked>&nbsp;&nbsp;' . _("Use a signature?") . '&nbsp;&nbsp;';
-   else
-      echo '<input type=checkbox value="1" name=usesignature>&nbsp;&nbsp;' . _("Use a signature?") . '&nbsp;&nbsp;';
-  if ( ! isset($prefix_sig) || $prefix_sig == true )
-    echo '<input type="checkbox" value="1" name="prefixsig" checked>&nbsp;&nbsp;' 
-        . _( "Prefix signature with '--' ?" ) . '<BR>';
-  else
-    echo '<input type="checkbox" value="1" name="prefixsig">&nbsp;&nbsp;' . 
-        _( "Prefix signature with '--' ?" ) . '<BR>';
-   echo "\n<textarea name=\"signature_edit\" rows=\"5\" cols=\"50\">$signature_abs</textarea><br>";
-?>
-            </td>
-         </tr>
-         <?php do_hook("options_personal_inside"); ?>
-         <tr>
-            <td>&nbsp;
-            </td><td>
-               <input type="submit" value="<?php echo _("Submit"); ?>" name="submit_personal">
-            </td>
-         </tr>
-      </table>   
-</form>
-
-   <?php do_hook('options_personal_bottom'); ?>
-
-    </td></tr>
-    </table>
-
-</td></tr>
-</table>
-</body></html>