Changeset 300fc65 in github

Timestamp:

Nov 20, 2008 5:29:34 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

73ba7ca

Parents:

322b79d

Message:

• Better HTML entities conversion in html2text (#1485519)

Files:

• CHANGELOG (modified) (1 diff)
• bin/html2text.php (modified) (1 diff)
• program/lib/html2text.php (modified) (2 diffs)
• program/steps/mail/compose.inc (modified) (1 diff)
• program/steps/mail/sendmail.inc (modified) (1 diff)

CHANGELOG

@@ -6 +6 @@
 - Fix handling of some malformed messages (#1484438)
 - Speed up raw message body handling
+- Better HTML entities conversion in html2text (#1485519)
 
 2008/11/15 (alec)

bin/html2text.php

@@ -23 +23 @@
 require INSTALL_PATH.'program/include/iniset.php';
 
-$converter = new html2text(html_entity_decode($HTTP_RAW_POST_DATA, ENT_COMPAT, 'UTF-8'));
+$converter = new html2text($HTTP_RAW_POST_DATA);
 
 header('Content-Type: text/plain; charset=UTF-8');

program/lib/html2text.php

@@ -233 +233 @@
         '-',
         '*',
-        '£',
+        '£',
         'EUR',                                  // Euro sign. € ?
         '',                                     // Unknown/unhandled entities
@@ -466 +466 @@
         // Convert <PRE>
         $this->_convert_pre($text);
-        
+
+        // Replace known html entities
+        $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
+
         // Run our defined search-and-replace
         $text = preg_replace($this->search, $this->replace, $text);

program/steps/mail/compose.inc

@@ -324 +324 @@
         {
             $h2t = new html2text($a_signatures[$identity_id]['text'], false, false);
-            $plainTextPart = $h2t->get_text();
-            $a_signatures[$identity_id]['plain_text'] = trim(html_entity_decode($plainTextPart, ENT_NOQUOTES, 'UTF-8'));
+            $a_signatures[$identity_id]['plain_text'] = trim($h2t->get_text());
         }
       }

program/steps/mail/sendmail.inc

@@ -266 +266 @@
     $plainTextPart = "\r\n"; 
     }
-  $MAIL_MIME->setTXTBody(html_entity_decode($plainTextPart, ENT_COMPAT, 'utf-8'));
+  $MAIL_MIME->setTXTBody($plainTextPart);
 
   // look for "emoticon" images from TinyMCE and copy into message as attachments