Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Improve format=flowed text unfolding, add test for signature separato…

…r handling
  • Loading branch information...
commit aabd62828672c055205292c77f1463260f3b0c51 1 parent 67cb017
@alecpl alecpl authored
View
18 program/lib/Roundcube/rcube_mime.php
@@ -476,14 +476,18 @@ public static function unfold_flowed($text)
$q_level = 0;
foreach ($text as $idx => $line) {
- if ($line[0] == '>' && preg_match('/^(>+\s*)/', $line, $regs)) {
- $q = strlen(str_replace(' ', '', $regs[0]));
- $line = substr($line, strlen($regs[0]));
-
+ if ($line[0] == '>') {
+ $len = strlen($line);
+ $line = preg_replace('/^>+ {0,1}/', '', $line);
+ $q = $len - strlen($line);
+
+ // The same paragraph (We join current line with the previous one) when:
+ // - the same level of quoting
+ // - previous line was flowed
+ // - previous line contains more than only one single space (and quote char(s))
if ($q == $q_level
- && strlen($line[$last]) > 1 // don't hit if line only consist of one single white space
- && isset($text[$last])
- && $text[$last][strlen($text[$last])-1] == ' '
+ && isset($text[$last]) && $text[$last][strlen($text[$last])-1] == ' '
+ && !preg_match('/^>+ {0,1}$/', $text[$last])
) {
$text[$last] .= $line;
unset($text[$idx]);
View
3  tests/src/format-flowed-unfolded.txt
@@ -12,3 +12,6 @@ On XX.YY.YYYY Y:YY, Somebody wrote:
> xxxxxxxxxx. xxxx xxxxx xxxxx xxxx xx xx.xx. xxxxxx xxxxxxxxxxxx, xxxx xx
>
> ... and this one as well.
+
+--
+Sig
View
3  tests/src/format-flowed.txt
@@ -14,3 +14,6 @@ On XX.YY.YYYY Y:YY, Somebody wrote:
> xxxxxxxxxx. xxxx xxxxx xxxxx xxxx xx xx.xx. xxxxxx xxxxxxxxxxxx, xxxx xx
>
> ... and this one as well.
+
+--
+Sig
Please sign in to comment.
Something went wrong with that request. Please try again.