Fix text wrapping issue with long unwrappable lines (#1489371)

Aleksander Machniak

2013-10-12 571aa9b04ea6345acc98e1671a8ebcfd7abb4f62

Fix text wrapping issue with long unwrappable lines (#1489371)

Conflicts:

	CHANGELOG

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Fix text wrapping issue with long unwrappable lines (#1489371)
- Fixed mispelling: occured -> occurred (#1489366)
- Fixed issues where HTML comments inside style tag would hang Internet Explorer
- Fix setting domain in virtualmin password driver (#1489332)

 program/lib/Roundcube/rcube_mime.php

@@ -637,7 +637,8 @@
                    if ($nextChar === ' ' || $nextChar === $separator) {
                        $afterNextChar = mb_substr($string, $width + 1, 1);

                        if ($afterNextChar === false) {
                        // Note: mb_substr() does never return False
                        if ($afterNextChar === false || $afterNextChar === '') {
                            $subString .= $nextChar;
                        }

@@ -650,16 +651,16 @@
                            $subString = mb_substr($subString, 0, $spacePos);
                            $cutLength = $spacePos + 1;
                        }
                        else if ($cut === false && $breakPos === false) {
                            $subString = $string;
                            $cutLength = null;
                        }
                        else if ($cut === false) {
                            $spacePos = mb_strpos($string, ' ', 0);

                            if ($spacePos !== false && $spacePos < $breakPos) {
                            if ($spacePos !== false && ($breakPos === false || $spacePos < $breakPos)) {
                                $subString = mb_substr($string, 0, $spacePos);
                                $cutLength = $spacePos + 1;
                            }
                            else if ($breakPos === false) {
                                $subString = $string;
                                $cutLength = null;
                            }
                            else {
                                $subString = mb_substr($string, 0, $breakPos);
@@ -667,7 +668,6 @@
                            }
                        }
                        else {
                            $subString = mb_substr($subString, 0, $width);
                            $cutLength = $width;
                        }
                    }

 tests/Framework/Mime.php

@@ -197,6 +197,10 @@
                array("http://xx.xxx.xx.xxx:8080/addressbooks/roundcubexxxxx%40xxxxxxxxxxxxxxxxxxxxxxx.xx.xx/testing/", 70),
                "http://xx.xxx.xx.xxx:8080/addressbooks/roundcubexxxxx%40xxxxxxxxxxxxxxxxxxxxxxx.xx.xx/testing/",
            ),
            array(
                array("this-is-just-some-blabla-to-make-this-more-than-seventy-five-characters-in-a-row -- this line should be wrapped", 20, "\n"),
                "this-is-just-some-blabla-to-make-this-more-than-seventy-five-characters-in-a-row\n-- this line should\nbe wrapped",
            ),
        );

        foreach ($samples as $sample) {