X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_personal.php;h=a2403528c47dd224b40e42b7eb527f74230873e0;hp=2937a5c6657211714e72564c5a117866bc68761a;hb=00b49b9ea83959dacbe2f7fb3c391c169f9c6470;hpb=f740c049d91feb836dd9633be9e8ff52c00d066f

diff --git a/src/options_personal.php b/src/options_personal.php
index 2937a5c6..a2403528 100644
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -10,16 +10,11 @@
     **  $Id$
     **/
 
-   include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
-   include('../functions/page_header.php');
-   include('../functions/display_messages.php');
-   include('../functions/imap.php');
-   include('../functions/array.php');
-   include('../functions/i18n.php');
-   include('../functions/plugin.php');
-   include('../src/load_prefs.php');
+   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');
    
    displayPageHeader($color, 'None');
 
@@ -29,12 +24,16 @@
 
 ?>
    <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>
+<table width=95% align=center border=0 cellpadding=2 cellspacing=0>
+<tr><td align="center" bgcolor="<?php echo $color[0] ?>">
 
-   <form name=f action="options.php" method=post>
-      <table width=100% cellpadding=0 cellspacing=2 border=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>
@@ -53,20 +52,58 @@
                <input size=50 type=text value="<?php echo $replyto ?>" name=reply_to> 
             </td>
          </tr>
+         <tr>
+            <td align="right" nowrap><?PHP echo _("Reply Citation Style") ?>:</td>
+            <td><select name="new_reply_citation_style">
+                <option value="none"<?PHP
+                    if ($reply_citation_style == 'none') echo ' SELECTED';
+                    ?>>- <?PHP echo _("No Citation"); ?> -</option>
+                <option value="author_said"<?PHP
+                    if ($reply_citation_style == 'author_said') echo ' SELECTED';
+                    ?>><?PHP echo _("AUTHOR Said"); ?></option>
+                <option value="quote_who"<?PHP
+                    if ($reply_citation_style == 'quote_who') echo ' SELECTED';
+                    ?>><?PHP echo _("Quote Who XML"); ?></option>
+                <option value="user-defined"<?PHP
+                    if ($reply_citation_style == 'user-defined') echo ' SELECTED';
+                    ?>><?PHP echo _("User-Defined"); ?></option>
+                </select>
+            </td>
+         </tr>
+         <tr>
+            <td align="right" nowrap><?php echo _("User-Defined Reply Citation"); ?>:</td>
+            <td>
+               <tt><input type="text" size="20" name="new_reply_citation_start" value="<?php
+                  echo $reply_citation_start;
+               ?>"></tt> &lt;<?php
+                  echo _("Author's Name");
+               ?>&gt;
+               <tt><input type="text" size="20" name="new_reply_citation_end" value="<?php
+                  echo $reply_citation_end;
+               ?>"></tt>
+            </td>
+         </tr>
+	 <tr>
+	    <td align=right nowrap><?PHP echo _("Multiple Identities"); ?>:
+	    </td><td>
+	       <a href="options_identities.php"><?PHP 
+   echo _("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 '<input type=checkbox value="1" name=usesignature';
+   if ($use_signature)
+      echo ' checked';
+   echo '>&nbsp;&nbsp;' . _("Use a signature?") . '&nbsp;&nbsp;';
+   echo '<input type="checkbox" value="1" name="prefixsig"';
+   if ( $prefix_sig )
+     echo ' checked';
+   echo '>&nbsp;&nbsp;' .
+        _( "Prefix signature with '-- ' ?" ) . '<BR>';
    echo "\n<textarea name=\"signature_edit\" rows=\"5\" cols=\"50\">$signature_abs</textarea><br>";
 ?>
             </td>
@@ -79,6 +116,13 @@
             </td>
          </tr>
       </table>   
-   </form>
+</form>
+
    <?php do_hook('options_personal_bottom'); ?>
-</body></html>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
+</body></html>
\ No newline at end of file