From 5ab9c6f623ea09cddc8c9729418f87df4f578e75 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 19 Mar 2007 22:36:24 +0000
Subject: Correctly parse message/rfc822; fixed html2text conversion; code
 cleanup

git-svn-id: https://svn.roundcube.net/trunk@511 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/lib/html2text.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'roundcubemail/program/lib')

diff --git a/roundcubemail/program/lib/html2text.inc b/roundcubemail/program/lib/html2text.inc
index eabe15c69..0ac72f7b3 100644
--- a/roundcubemail/program/lib/html2text.inc
+++ b/roundcubemail/program/lib/html2text.inc
@@ -112,7 +112,7 @@ class html2text
         "/[\n\t]+/",                             // Newlines and tabs
         '/<script[^>]*>.*?<\/script>/i',         // <script>s -- which strip_tags supposedly has problems with
         //'/<!-- .* -->/',                         // Comments -- which strip_tags might have problem a with
-        '/<a href="([^"]+)"[^>]*>(.+?)<\/a>/ie', // <a href="">
+        '/<a [^>]*href="([^"]+)"[^>]*>(.+?)<\/a>/ie', // <a href="">
         '/<h[123][^>]*>(.+?)<\/h[123]>/ie',      // H1 - H3
         '/<h[456][^>]*>(.+?)<\/h[456]>/ie',      // H4 - H6
         '/<p[^>]*>/i',                           // <P>
@@ -160,11 +160,11 @@ class html2text
         '',                                     // Non-legal carriage return
         ' ',                                    // Newlines and tabs
         '',                                     // <script>s -- which strip_tags supposedly has problems with
-        //'',                                     // Comments -- which strip_tags might have problem a with
+        //'',                                  // Comments -- which strip_tags might have problem a with
         '$this->_build_link_list("\\1", "\\2")', // <a href="">
         "strtoupper(\"\n\n\\1\n\n\")",          // H1 - H3
-        "ucwords(\"\n\n\\1\n\n\")",             // H4 - H6
-        "\n",                                   // <P>
+        "ucwords(\"\n\n\\1\n\")",               // H4 - H6
+        "\n\n",                                 // <P>
         "\n",                                   // <br>
         'strtoupper("\\1")',                    // <b>
         '_\\1_',                                // <i>
@@ -255,7 +255,7 @@ class html2text
      *  @access public
      *  @return void
      */
-    function html2text( $source = '', $from_file = false, $do_link_table = true )
+    function html2text( $source = '', $from_file = false, $produce_link_table = true )
     {
         if ( !empty($source) ) {
             $this->set_html($source, $from_file);
-- 
cgit v1.2.3