From 76a89bf04d7c3dd6b6261ca55a24fd57a30d50cb Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 15 Apr 2008 09:23:52 -0400
Subject: [PATCH] #1333167 #1484916
---
CHANGELOG | 6 ++++++
program/lib/imap.inc | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index e88b41c..fdb7685 100644
--- a/CHANGELOG
+++ b/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/program/lib/imap.inc b/program/lib/imap.inc
index 96353dd..5c15353 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -2360,9 +2360,9 @@
}
$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 @@
} 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;
--
Gitblit v1.9.1