Included no -- prefix support for signature.

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

diff --git a/src/compose.php b/src/compose.php
index 9e60b0927c436d9c644d3b79d2daecc818dd8714..0a4db331b3595cafcbeff1e701822ab9ec5ff6cd 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -192,10 +192,10 @@
 
    function showInputForm () {
       global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
-         $passed_body, $color, $use_signature, $signature, $editor_size,
-         $attachments, $subject, $newmail, $use_javascript_addr_book,
-         $send_to_bcc, $reply_id, $mailbox, $from_htmladdr_search,
-         $location_of_buttons;
+         $passed_body, $color, $use_signature, $signature, $prefix_sig, 
+         $editor_size, $attachments, $subject, $newmail, 
+         $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox, 
+         $from_htmladdr_search, $location_of_buttons;
 
       $subject = decodeHeader($subject);
       $reply_subj = decodeHeader($reply_subj);
@@ -280,7 +280,10 @@
       echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>";
       echo htmlspecialchars($body);
       if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
-         echo "\n\n-- \n" . htmlspecialchars($signature);
+        if ( $prefix_sig == true )
+          echo "\n\n-- \n" . htmlspecialchars($signature);
+        else
+          echo "\n\n" . htmlspecialchars($signature);
       }
       echo "</TEXTAREA><BR>\n";
       echo "      </TD>\n";

diff --git a/src/options.php b/src/options.php
index 643f3e79e21f80771604f18c1e745039010fb0e0..71b0e3ea6c34cf5aa573fecf8b95644bc17af4f0 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -53,6 +53,7 @@
       if (isset($email_address)) setPref($data_dir, $username, 'email_address', $email_address);
       if (isset($reply_to)) setPref($data_dir, $username, 'reply_to', $reply_to);  
       setPref($data_dir, $username, 'use_signature', $usesignature);  
+      setPref($data_dir, $username, 'prefix_sig', $prefixsig);
       if (isset($signature_edit)) setSig($data_dir, $username, $signature_edit);
       
       do_hook('options_personal_save');

diff --git a/src/options_personal.php b/src/options_personal.php
index 415f997f3e41b41c1cd57ec1c334099f2596cab2..a382dad3ffcc4c2de3d6479dd256c9e21323841e 100644 (file)
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -67,12 +67,15 @@
             </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 '<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>