This might fix the problem with adding slashes when composing messages

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

diff --git a/functions/smtp.php b/functions/smtp.php
index 5a71dc516360120dd72e079ebf1755a6d920b009..e9a86fd9e99044407d9d5266e82a1a85779de642 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -129,11 +129,11 @@
         fputs ($fp, "--".mimeBoundary()."\n");
         fputs ($fp, "Content-Type: text/plain; charset=ISO-8859-1\n");
         fputs ($fp, "Content-Transfer-Encoding: 8bit\n\n");
         fputs ($fp, "--".mimeBoundary()."\n");
         fputs ($fp, "Content-Type: text/plain; charset=ISO-8859-1\n");
         fputs ($fp, "Content-Transfer-Encoding: 8bit\n\n");

-        fputs ($fp, "$body\n");
+        fputs ($fp, stripslashes($body) . "\n");

         attachFiles($fp);
         fputs ($fp, "\n--".mimeBoundary()."--\n");
      } else {
         attachFiles($fp);
         fputs ($fp, "\n--".mimeBoundary()."--\n");
      } else {

-       fputs ($fp, "$body\n");
+       fputs ($fp, stripslashes($body) . "\n");

      }
    }
 
      }
    }
 

diff --git a/src/compose.php b/src/compose.php
index 8f578972f353781a92b70d311cc0623670eed56c..2af8b6bd5078caab02fd2802c4f3276a95d7526a 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -238,9 +238,9 @@
       echo "   <TR>\n";
       echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
       if ($use_signature == true)
       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>";
+         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>". $body . "\n\n".$signature."</TEXTAREA><BR>";

       else
       else

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

       echo "      </TD>\n";
       echo "   </TR>\n";
       echo "   <TR><TD COLSPAN=2 ALIGN=CENTER><INPUT TYPE=SUBMIT NAME=send VALUE=\"";
       echo "      </TD>\n";
       echo "   </TR>\n";
       echo "   <TR><TD COLSPAN=2 ALIGN=CENTER><INPUT TYPE=SUBMIT NAME=send VALUE=\"";

diff --git a/src/options.php b/src/options.php
index 8568973d44ffed84bd3b6026f18ef60f130aec61..6adb81ec14aeb1b9d097758471a26968ff362e38 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -138,7 +138,6 @@
    echo "         </FONT>";
    echo "      </TD>";
    echo "   </TR>";
    echo "         </FONT>";
    echo "      </TD>";
    echo "   </TR>";

-   echo "</TABLE>";

 
    // LEFT_REFRESH
    echo "   <TR>";
 
    // LEFT_REFRESH
    echo "   <TR>";