Fixed a problem with signatures getting added all the time when

attaching files.

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

diff --git a/functions/smtp.php b/functions/smtp.php
index 58f9db79beee8d63987a0c7b5246a1d3606296d9..6c81019330f8454685daab795459fb9b664e055a 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -6,9 +6,6 @@
     **/
 
 
     **/
 
 

-   /* These next 2 functions are stub functions for implementations of 
-      attachments */
-

    // Returns true only if this message is multipart
    function isMultipart () {
       global $attachments;
    // Returns true only if this message is multipart
    function isMultipart () {
       global $attachments;

diff --git a/src/compose.php b/src/compose.php
index 6e73f0b155e5654dd4ea3557dcf05aa2d69af318..8f7044b30f50707e30df43a7e649ad17d2e7f630 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -134,7 +134,7 @@
    function showInputForm () {
       global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
          $passed_body, $color, $use_signature, $signature, $editor_size,
    function showInputForm () {
       global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
          $passed_body, $color, $use_signature, $signature, $editor_size,

-         $attachments, $subject;
+         $attachments, $subject, $newmail;

 
       echo "\n<FORM action=\"compose.php\" METHOD=POST\n";
       echo "ENCTYPE=\"multipart/form-data\">\n";
 
       echo "\n<FORM action=\"compose.php\" METHOD=POST\n";
       echo "ENCTYPE=\"multipart/form-data\">\n";


@@ -202,8 +202,8 @@
 
       echo "   <TR>\n";
       echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
 
       echo "   <TR>\n";
       echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";

-      if ($use_signature == true)
-         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>". $body . "\n\n".$signature."</TEXTAREA><BR>";
+      if ($use_signature == true && $newmail == true)
+         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>". $body . "\n\n-- \n".$signature."</TEXTAREA><BR>";

       else
          echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>".$body."</TEXTAREA><BR>\n";
       echo "      </TD>\n";
       else
          echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>".$body."</TEXTAREA><BR>\n";
       echo "      </TD>\n";


@@ -308,7 +308,7 @@
 
       showInputForm();
    } else {
 
       showInputForm();
    } else {

-      Newmail();
+      $newmail = true;

       showInputForm();
    }
 ?>
       showInputForm();
    }
 ?>