summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-04-15 13:23:52 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-04-15 13:23:52 +0000
commitd93e50bd7f7fc815c6f61bd5adb6fd9f80dc1d32 (patch)
treea8d7c48bf7d257ef53fcf3c0fda362bfea94ab2d
parent84c3abc232b0147ff19f7eb5afd250266c863d88 (diff)
#1333167
#1484916 git-svn-id: https://svn.roundcube.net/trunk@1306 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG6
-rw-r--r--roundcubemail/program/lib/imap.inc6
2 files changed, 9 insertions, 3 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index e88b41ca5..fdb7685f3 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,12 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/04/15 (alec)
+----------
+- Fix remove signature when replying (#1333167)
+- Fix problem with line with a space at the end (#1484916)
+- Don't send set_env() in ajax response when env array is empty
+
2008/04/14 (alec)
----------
- Added sections (fieldset+label) in Settings interface
diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc
index 96353dd2f..5c15353f5 100644
--- a/roundcubemail/program/lib/imap.inc
+++ b/roundcubemail/program/lib/imap.inc
@@ -2360,9 +2360,9 @@ function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode) {
}
$received += strlen($line);
if ($mode == 1) {
- $result .= chop($line) . "\n";
+ $result .= rtrim($line, "\t\r\n\0\x0B") . "\n";
} else if ($mode == 2) {
- echo chop($line) . "\n"; flush();
+ echo rtrim($line, "\t\r\n\0\x0B") . "\n"; flush();
} else if ($mode == 3) {
echo base64_decode($line); flush();
}
@@ -2374,7 +2374,7 @@ function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode) {
} while (!iil_StartsWith($line, $key));
if ($result) {
- $result = chop($result);
+ $result = rtrim($result, "\t\r\n\0\x0B");
return $result; // substr($result, 0, strlen($result)-1);
}
return false;