diff options
| author | alecpl <alec@alec.pl> | 2010-09-04 08:01:10 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-09-04 08:01:10 +0000 |
| commit | 272a7e5a24b9f9cb2748809f90be247d4f171465 (patch) | |
| tree | 2cd74cce28794f3adc43d5a5ed9a80dfd7f8ce2e /program | |
| parent | 086767c8f273e3bdd6c455876ccbcd876041b503 (diff) | |
- Don't use mail_header_delimiter when saving mail in IMAP
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_imap.php | 7 | ||||
| -rw-r--r-- | program/include/rcube_imap_generic.php | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 3aa2132fc..c5b10e626 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -2239,11 +2239,8 @@ class rcube_imap // make sure mailbox exists if ($this->mailbox_exists($mbox_name, true)) { - if ($is_file) { - $separator = rcmail::get_instance()->config->header_delimiter(); - $saved = $this->conn->appendFromFile($mailbox, $message, - $headers, $separator.$separator); - } + if ($is_file) + $saved = $this->conn->appendFromFile($mailbox, $message, $headers); else $saved = $this->conn->append($mailbox, $message); } diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php index de57671d4..6cf86fc24 100644 --- a/program/include/rcube_imap_generic.php +++ b/program/include/rcube_imap_generic.php @@ -1996,7 +1996,7 @@ class rcube_imap_generic return false; } - function appendFromFile($folder, $path, $headers=null, $separator="\n\n") + function appendFromFile($folder, $path, $headers=null) { if (!$folder) { return false; @@ -2012,14 +2012,16 @@ class rcube_imap_generic return false; } + $body_separator = "\r\n\r\n"; $len = filesize($path); + if (!$len) { return false; } if ($headers) { $headers = preg_replace('/[\r\n]+$/', '', $headers); - $len += strlen($headers) + strlen($separator); + $len += strlen($headers) + strlen($body_separator); } // send APPEND command @@ -2035,7 +2037,7 @@ class rcube_imap_generic // send headers with body separator if ($headers) { - $this->putLine($headers . $separator, false); + $this->putLine($headers . $body_separator, false); } // send file |