From 272a7e5a24b9f9cb2748809f90be247d4f171465 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Sat, 04 Sep 2010 04:01:10 -0400 Subject: [PATCH] - Don't use mail_header_delimiter when saving mail in IMAP --- program/include/rcube_imap_generic.php | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php index de57671..6cf86fc 100644 --- a/program/include/rcube_imap_generic.php +++ b/program/include/rcube_imap_generic.php @@ -1996,7 +1996,7 @@ 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 @@ 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 @@ // send headers with body separator if ($headers) { - $this->putLine($headers . $separator, false); + $this->putLine($headers . $body_separator, false); } // send file -- Gitblit v1.9.1