Converted sm-1_0 to branch and sm-1_1 to trunk

[squirrelmail.git] / src / options_personal.php

diff --git a/src/options_personal.php b/src/options_personal.php
index df5adea18f417164f3d1cec07010cefac75e13ac..a382dad3ffcc4c2de3d6479dd256c9e21323841e 100644 (file)
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -7,33 +7,34 @@
     **
     **  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");
+      include('../functions/strings.php');
+   if (!isset($config_php))
+      include('../config/config.php');
    if (!isset($page_header_php))
-      include("../functions/page_header.php");
+      include('../functions/page_header.php');
    if (!isset($display_messages_php))
-      include("../functions/display_messages.php");
+      include('../functions/display_messages.php');
    if (!isset($imap_php))
-      include("../functions/imap.php");
+      include('../functions/imap.php');
    if (!isset($array_php))
-      include("../functions/array.php");
+      include('../functions/array.php');
    if (!isset($i18n_php))
-      include("../functions/i18n.php");
+      include('../functions/i18n.php');
    if (!isset($plugin_php))
-      include("../functions/plugin.php");
+      include('../functions/plugin.php');
 
-   include("../src/load_prefs.php");
-   displayPageHeader($color, "None");
+   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>
@@ -66,13 +67,16 @@
             </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 ( $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>
@@ -85,5 +89,5 @@
          </tr>
       </table>   
    </form>
-   <?php do_hook("options_personal_bottom"); ?>
+   <?php do_hook('options_personal_bottom'); ?>
 </body></html>