X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_personal.php;h=170f625a09b3d36a7c25ebd5d4fa23f8f1aa1c03;hb=aaf9abef1f3d4f8a3c5dc365a4c2c98f5b153831;hp=7db053d03cfe14e58b2bb2a1c0fc571209023bd6;hpb=245a6892bf5c780904ef9677f24d624ea17e0749;p=squirrelmail.git

diff --git a/src/options_personal.php b/src/options_personal.php
index 7db053d0..170f625a 100644
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -10,31 +10,19 @@
     **  $Id$
     **/
 
-   session_start();
+   include('../src/validate.php');
+   include('../functions/page_header.php');
+   include('../functions/display_messages.php');
+   include('../functions/imap.php');
+   include('../functions/array.php');
+   include('../functions/plugin.php');
+   include('../src/load_prefs.php');
+   
+   displayPageHeader($color, 'None');
 
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.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"); 
+   $fullname = getPref($data_dir, $username, 'full_name');
+   $replyto = getPref($data_dir, $username, 'reply_to');
+   $email_address  = getPref($data_dir, $username, 'email_address'); 
 
 ?>
    <br>
@@ -62,18 +50,29 @@
                <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") . "?<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>";
+      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>
@@ -86,5 +85,5 @@
          </tr>
       </table>   
    </form>
-   <?php do_hook("options_personal_bottom"); ?>
+   <?php do_hook('options_personal_bottom'); ?>
 </body></html>