|
|
@ -208,11 +208,6 @@ class rcube_smtp
|
|
|
|
else if (is_string($headers)) {
|
|
|
|
else if (is_string($headers)) {
|
|
|
|
$text_headers = $headers;
|
|
|
|
$text_headers = $headers;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
|
|
|
$this->reset();
|
|
|
|
|
|
|
|
$this->response[] = "Invalid message headers";
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// exit if no from address is given
|
|
|
|
// exit if no from address is given
|
|
|
|
if (!isset($from)) {
|
|
|
|
if (!isset($from)) {
|
|
|
@ -275,8 +270,11 @@ class rcube_smtp
|
|
|
|
|
|
|
|
|
|
|
|
if (is_resource($body)) {
|
|
|
|
if (is_resource($body)) {
|
|
|
|
// file handle
|
|
|
|
// file handle
|
|
|
|
$data = $body;
|
|
|
|
$data = $body;
|
|
|
|
$text_headers = preg_replace('/[\r\n]+$/', '', $text_headers);
|
|
|
|
|
|
|
|
|
|
|
|
if ($text_headers) {
|
|
|
|
|
|
|
|
$text_headers = preg_replace('/[\r\n]+$/', '', $text_headers);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
// Concatenate headers and body so it can be passed by reference to SMTP_CONN->data
|
|
|
|
// Concatenate headers and body so it can be passed by reference to SMTP_CONN->data
|
|
|
|