whoops.. didn't mean to commit this stuff

[squirrelmail.git] / functions / smtp.php

diff --git a/functions/smtp.php b/functions/smtp.php
index 4500ad6b7ad079f9d489f84c200fdf381a5a71d6..cae5cbc02caddf0570ef6b6512a3f881b15155c6 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -462,7 +462,7 @@
          case 554:   $message = 'Transaction failed';
                      $status = 0;
                      break;
-         default:    $message = Unknown response: '. nl2br(htmlspecialchars($lines));
+         default:    $message = 'Unknown response: '. nl2br(htmlspecialchars($lines));
                      $status = 0;
                      $error_num = '001';
                      break;
@@ -516,11 +516,6 @@
       $body = ereg_replace("\r\n", "\n", $body);
       $body = ereg_replace("\n", "\r\n", $body);
       
-      // Make sure that $t, $c, and $b do not contain newlines.
-      $t = ereg_replace("[\n|\r]", "", $t);
-      $c = ereg_replace("[\n|\r]", "", $c);
-      $b = ereg_replace("[\n|\r]", "", $b);
-
       if ($useSendmail) {
          $length = sendSendmail($t, $c, $b, $subject, $body, $more_headers);
       } else {
@@ -538,4 +533,4 @@
       deleteAttachments();
    }
 
-?>
\ No newline at end of file
+?>