Changeset 342 in subversion

Timestamp:

Sep 13, 2006 12:49:18 AM (7 years ago)

Author:

estadtherr

Message:

Fixed bug #1484019 and #1484020

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/html2text.inc (modified) (3 diffs)
• program/lib/imap.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2006/09/12 (estadtherr)
+----------
+- Fixed html2text treatment of table headers (Bug #1484020)
+- Fixed IMAP fetch of message body (Bug #1484019)
+
 
 2006/09/08 (thomasb)

trunk/roundcubemail/program/lib/html2text.inc

@@ -127 +127 @@
         '/(<tr[^>]*>|<\/tr>)/i',                 // <tr> and </tr>
         '/<td[^>]*>(.+?)<\/td>/i',               // <td> and </td>
-        '/<th[^>]*>(.+?)<\/th>/i',               // <th> and </th>
+        '/<th[^>]*>(.+?)<\/th>/ie',              // <th> and </th>
         '/&nbsp;/i',
         '/&quot;/i',
         '/&gt;/i',
         '/&lt;/i',
-        '/&amp;/i',
+        '/&(amp|#38);/i',
         '/&copy;/i',
         '/&trade;/i',
@@ -138 +138 @@
         '/&#8221;/',
         '/&#8211;/',
-        '/&#8217;/',
-        '/&#38;/',
+        '/&#(8217|39);/',
         '/&#169;/',
         '/&#8482;/',
@@ -189 +188 @@
         '-',
         "'",
-        '&',
         '(c)',
         '(tm)',

trunk/roundcubemail/program/lib/imap.inc

@@ -1888 +1888 @@
                 $line = iil_ReadLine($fp, 1024);
                 $len = strlen($line);
-                if ($len > $remaining) substr($line, 0, $remaining);
+                if ($len > $remaining) $line = substr($line, 0, $remaining);
                 $received += strlen($line);
                 if ($mode==1) $result .= chop($line)."\n";