Fixes the bug in the Prefix signature with '--' ? parameter.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1520 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/load_prefs.php b/src/load_prefs.php
index aed52bd33cf9f008a1b8d6042eb208b90d3b1bf2..edec5a4f47be7099c2901d88ca16c70291b343af 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -161,9 +161,6 @@
    }
 
    $prefix_sig = getPref($data_dir, $username, "prefix_sig");
    }
 
    $prefix_sig = getPref($data_dir, $username, "prefix_sig");

-   if ($prefix_sig == "") {
-      $prefix_sig = true;
-   }

 
    /* Load preferences for reply citation style. */
    global $reply_citation_style, $reply_citation_start, $reply_citation_end;
 
    /* Load preferences for reply citation style. */
    global $reply_citation_style, $reply_citation_start, $reply_citation_end;

diff --git a/src/options_personal.php b/src/options_personal.php
index c4c8e039e0981fc5c75e04c494d6c1e199ef5a51..9b58168e27018dd54b3ac84189a24d8c2c66defd 100644 (file)
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -21,7 +21,7 @@
    $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'); 

-
+echo $prefix_sig;

 ?>
    <br>
 <table width=95% align=center border=0 cellpadding=2 cellspacing=0>
 ?>
    <br>
 <table width=95% align=center border=0 cellpadding=2 cellspacing=0>


@@ -86,24 +86,23 @@
         <tr>
            <td align=right nowrap><?PHP echo _("Multiple Identities"); ?>:
            </td><td>
         <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>
+              <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
         </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;' . 
+   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>";
 ?>
         _( "Prefix signature with '--' ?" ) . '<BR>';
    echo "\n<textarea name=\"signature_edit\" rows=\"5\" cols=\"50\">$signature_abs</textarea><br>";
 ?>