Changeset e7f85bd in github

Timestamp:

Aug 30, 2008 8:35:36 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

ade8e11

Parents:

8ac6fd0

Message:

• applied RC's patches after html2text update

File:

• program/lib/html2text.php (modified) (4 diffs)

program/lib/html2text.php

@@ -315 +315 @@
     var $_link_count = 0;
 
+    /** 
+     * 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.
@@ -324 +333 @@
      *  @param string $source HTML content
      *  @param boolean $from_file Indicates $source is a file to pull content from
-     *  @access public
-     *  @return void
-     */
-    function html2text( $source = '', $from_file = false )
+     *  @param boolean $do_links Indicate whether a table of link URLs is desired
+     *  @param integer $width Maximum width of the formatted text, 0 for no limit
+     *  @access public
+     *  @return void
+     */
+    function html2text( $source = '', $from_file = false, $do_links = true, $width = 75 )
     {
         if ( !empty($source) ) {
             $this->set_html($source, $from_file);
         }
+        
         $this->set_base_url();
+        $this->_do_links = $do_links;
+        $this->width = $width;
     }
 
@@ -350 +364 @@
         else
             $this->html = $source;
-
 
         $this->_converted = false;
@@ -496 +509 @@
     function _build_link_list( $link, $display )
     {
-                if ( substr($link, 0, 7) == 'http://' || substr($link, 0, 8) == 'https://' ||
+        if ( !$this->_do_links ) return $display;
+        
+        if ( substr($link, 0, 7) == 'http://' || substr($link, 0, 8) == 'https://' ||
              substr($link, 0, 7) == 'mailto:' ) {
             $this->_link_count++;