Fixed some slash problems

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

diff --git a/functions/smtp.php b/functions/smtp.php
index f75ea3e808009f4924dbab4a817a27437376712c..05f16f3c5501c9863cce885596ad58a930c9242b 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -22,7 +22,6 @@
       $to = parseAddrs($t);
       $cc = parseAddrs($c);
       $bcc = parseAddrs($b);
-      $body = stripslashes($body);
       $from_addr = "$username@$domain";
       $reply_to = getPref($data_dir, $username, "reply_to");
       $from = getPref($data_dir, $username, "full_name");
@@ -76,7 +75,6 @@
       $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
       errorCheck($tmp);
 
-      $subject = stripslashes($subject);
       fputs($smtpConnection, "Subject: $subject\n"); // Subject
       fputs($smtpConnection, "From: $from\n"); // Subject
       fputs($smtpConnection, "To: $to_list\n");    // Who it's TO
@@ -90,7 +88,6 @@
       if ($reply_to != "")
          fputs($smtpConnection, "Reply-To: $reply_to\n");
 
-      $body = stripslashes($body);
       fputs($smtpConnection, "$body\n"); // send the body of the message
 
       fputs($smtpConnection, ".\n"); // end the DATA part

diff --git a/src/compose_send.php b/src/compose_send.php
index 6bc1c75f24e9c190da342c86ed73c12d90da6b49..d9cb37c5c0b023760ac8997ba1711c2de4e9d6ef 100644 (file)
--- a/src/compose_send.php
+++ b/src/compose_send.php
@@ -45,6 +45,12 @@
       exit;
    }
 
+   $passed_body = stripslashes($passed_body);
+   $passed_to = stripslashes($passed_to);
+   $passed_cc = stripslashes($passed_cc);
+   $passed_bcc = stripslashes($passed_bcc);
+   $passed_subject = stripslashes($passed_subject);
+
    sendMessage($smtpServerAddress, $smtpPort, $username, $domain, $passed_to, $passed_cc, $passed_bcc, $passed_subject, $passed_body, $version);
 
    if ($auto_forward == true)

diff --git a/src/options_submit.php b/src/options_submit.php
index ff32aff6854b40f46fe005d5c92d65a1ff740ede..3c210e62c1b13b39e6a6b24d1202ac1278c27ef1 100644 (file)
--- a/src/options_submit.php
+++ b/src/options_submit.php
@@ -21,7 +21,7 @@
    setPref($data_dir, $username, "editor_size", $editorsize);
    setPref($data_dir, $username, "use_signature", $usesignature);
 
-   setSig($data_dir, $username, $signature_edit);
+   setSig($data_dir, $username, stripslashes($signature_edit));
 
    echo "<FONT FACE=\"Arial,Helvetica\">";
    echo "<BR><BR><BR><CENTER><B>Options Saved!</B><BR><BR>";