From dd792e8253f6fa94eba4e95293a32f8bc91289bb Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Sun, 3 Dec 2006 22:32:16 +0000
Subject: fixed signature issues

---
 program/lib/html2text.inc | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'program/lib/html2text.inc')

diff --git a/program/lib/html2text.inc b/program/lib/html2text.inc
index 36849a492..eabe15c69 100644
--- a/program/lib/html2text.inc
+++ b/program/lib/html2text.inc
@@ -164,7 +164,7 @@ class html2text
         '$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\n\t",                               // <P>
+        "\n",                                   // <P>
         "\n",                                   // <br>
         'strtoupper("\\1")',                    // <b>
         '_\\1_',                                // <i>
@@ -232,6 +232,15 @@ class html2text
      *  @see _build_link_list()
      */
     var $_link_list = array();
+    
+    /**
+     * Boolean flag, true if a table of link URLs should be listed after the text.
+     * 
+     * @var boolean $_do_links
+     * @access private
+     * @see html2text()
+     */
+    var $_do_links = true;
 
     /**
      *  Constructor.
@@ -242,15 +251,17 @@ class html2text
      *
      *  @param string $source HTML content
      *  @param boolean $from_file Indicates $source is a file to pull content from
+     *  @param boolean $do_link_table indicate whether a table of link URLs is desired
      *  @access public
      *  @return void
      */
-    function html2text( $source = '', $from_file = false )
+    function html2text( $source = '', $from_file = false, $do_link_table = true )
     {
         if ( !empty($source) ) {
             $this->set_html($source, $from_file);
         }
         $this->set_base_url();
+        $this->_do_links = $produce_link_table;
     }
 
     /**
@@ -409,6 +420,8 @@ class html2text
     */
     function _build_link_list($link, $display)
       {
+      if (! $this->_do_links) return $display;
+
       $link_lc = strtolower($link);
       
       if (substr($link_lc, 0, 7) == 'http://' || substr($link_lc, 0, 8) == 'https://' || substr($link_lc, 0, 7) == 'mailto:')
-- 
cgit v1.2.3