Permalink
Browse files

MDL-17542 lib/html2text: update to latest upstream version (r2374)

  • Loading branch information...
fmarier
fmarier committed May 22, 2009
1 parent 6af26c8 commit d78b0e324f271898025ee97eaedc11e1d53d4f41
Showing with 51 additions and 50 deletions.
  1. +46 −47 lib/html2text.php
  2. +5 −0 lib/html2text_readme.txt
  3. +0 −3 lib/weblib.php
View
@@ -176,7 +176,6 @@ class html2text
'/&(bull|#149|#8226);/i', // Bullet
'/&(pound|#163);/i', // Pound sign
'/&(euro|#8364);/i', // Euro sign
- '/&[^&;]+;/i', // Unknown/unhandled entities
'/[ ]{2,}/' // Runs of spaces, post-handling
);
@@ -202,8 +201,8 @@ class html2text
"\n\n", // <ol> and </ol>
"\t* \\1\n", // <li> and </li>
"\n\t* ", // <li>
- "\n-------------------------\n", // <hr>
- "\n\n", // <table> and </table>
+ "\n-------------------------\n", // <hr>
+ "\n\n", // <table> and </table>
"\n", // <tr> and </tr>
"\t\t\\1\n", // <td> and </td>
' ', // Non-breaking space
@@ -220,7 +219,6 @@ class html2text
'*',
'£',
'EUR', // Euro sign. € ?
- '', // Unknown/unhandled entities
' ' // Runs of spaces, post-handling
);
@@ -249,11 +247,11 @@ class html2text
* @see $pre_replace
*/
var $pre_search = array(
- "/\n/",
- "/\t/",
- '/ /',
- '/<pre[^>]*>/',
- '/<\/pre>/'
+ "/\n/",
+ "/\t/",
+ '/ /',
+ '/<pre[^>]*>/',
+ '/<\/pre>/'
);
/**
@@ -264,11 +262,11 @@ class html2text
* @see $pre_search
*/
var $pre_replace = array(
- '<br>',
- '&nbsp;&nbsp;&nbsp;&nbsp;',
- '&nbsp;',
- '',
- ''
+ '<br>',
+ '&nbsp;&nbsp;&nbsp;&nbsp;',
+ '&nbsp;',
+ '',
+ ''
);
/**
@@ -344,10 +342,10 @@ function html2text( $source = '', $from_file = false, $do_links = true, $width =
if ( !empty($source) ) {
$this->set_html($source, $from_file);
}
-
+
$this->set_base_url();
- $this->_do_links = $do_links;
- $this->width = $width;
+ $this->_do_links = $do_links;
+ $this->width = $width;
}
/**
@@ -361,10 +359,10 @@ function html2text( $source = '', $from_file = false, $do_links = true, $width =
function set_html( $source, $from_file = false )
{
if ( $from_file && file_exists($source) ) {
- $this->html = file_get_contents($source);
+ $this->html = file_get_contents($source);
}
else
- $this->html = $source;
+ $this->html = $source;
$this->_converted = false;
}
@@ -465,16 +463,19 @@ function _convert()
$text = trim(stripslashes($this->html));
- // Convert <PRE>
+ // 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);
$text = preg_replace_callback($this->callback_search, array('html2text', '_preg_callback'), $text);
+ // Replace known html entities
+ $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
+
+ // Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
+ $text = preg_replace('/&[^&;]+;/i', '', $text);
+
// Strip any other HTML tags
$text = strip_tags($text, $this->allowed_tags);
@@ -521,9 +522,9 @@ function _build_link_list( $link, $display )
$this->_link_count++;
$this->_link_list .= "[" . $this->_link_count . "] $link\n";
$additional = ' [' . $this->_link_count . ']';
- } elseif ( substr($link, 0, 11) == 'javascript:' ) {
- // Don't count the link; ignore it
- $additional = '';
+ } elseif ( substr($link, 0, 11) == 'javascript:' ) {
+ // Don't count the link; ignore it
+ $additional = '';
// what about href="#anchor" ?
} else {
$this->_link_count++;
@@ -546,11 +547,10 @@ function _build_link_list( $link, $display )
*/
function _convert_pre(&$text)
{
- while(preg_match('/<pre[^>]*>(.*)<\/pre>/ismU', $text, $matches))
- {
- $result = preg_replace($this->pre_search, $this->pre_replace, $matches[1]);
- $text = preg_replace('/<pre[^>]*>.*<\/pre>/ismU', '<div><br>' . $result . '<br></div>', $text, 1);
- }
+ while(preg_match('/<pre[^>]*>(.*)<\/pre>/ismU', $text, $matches)) {
+ $result = preg_replace($this->pre_search, $this->pre_replace, $matches[1]);
+ $text = preg_replace('/<pre[^>]*>.*<\/pre>/ismU', '<div><br>' . $result . '<br></div>', $text, 1);
+ }
}
/**
@@ -562,18 +562,17 @@ function _convert_pre(&$text)
*/
function _preg_callback($matches)
{
- switch($matches[1])
- {
- case 'b':
- case 'strong':
- return $this->_strtoupper($matches[2]);
- case 'hr':
- return $this->_strtoupper("\t\t". $matches[2] ."\n");
- case 'h':
- return $this->_strtoupper("\n\n". $matches[2] ."\n\n");
- case 'a':
- return $this->_build_link_list($matches[3], $matches[4]);
- }
+ switch($matches[1]) {
+ case 'b':
+ case 'strong':
+ return $this->_strtoupper($matches[2]);
+ case 'hr':
+ return $this->_strtoupper("\t\t". $matches[2] ."\n");
+ case 'h':
+ return $this->_strtoupper("\n\n". $matches[2] ."\n\n");
+ case 'a':
+ return $this->_build_link_list($matches[3], $matches[4]);
+ }
}
/**
@@ -585,10 +584,10 @@ function _preg_callback($matches)
*/
function _strtoupper($str)
{
- if (function_exists('mb_strtoupper'))
- return mb_strtoupper($str);
- else
- return strtoupper($str);
+ if (function_exists('mb_strtoupper'))
+ return mb_strtoupper($str);
+ else
+ return strtoupper($str);
}
}
View
@@ -0,0 +1,5 @@
+html2text.php is an unmodified copy of a file shipped with the RoundCube project:
+
+ http://trac.roundcube.net/log/trunk/roundcubemail/program/lib/html2text.php
+
+ -- Francois Marier <francois@catalyst.net.nz> 2009-05-22
View
@@ -1960,9 +1960,6 @@ function html_to_text($html) {
$h2t = new html2text($html);
$result = $h2t->get_text();
- // html2text does not fix HTML entities so handle those here.
- $result = html_entity_decode($result, ENT_NOQUOTES, 'UTF-8');
-
return $result;
}

0 comments on commit d78b0e3

Please sign in to comment.