summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2009-02-27 10:56:45 +0000
committerthomascube <thomas@roundcube.net>2009-02-27 10:56:45 +0000
commit6972ccaf311e0f7c0c912e6a3bfa9e23394807d3 (patch)
tree95c47671dea62649de531a40d845922fffe0e203 /program/lib
parent57aa4fe4feb7069e8b2408d57bcf2a96b26c1d61 (diff)
Changed code style for better diffs
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/html2text.php80
1 files changed, 39 insertions, 41 deletions
diff --git a/program/lib/html2text.php b/program/lib/html2text.php
index b00c28abc..e78ea10a9 100644
--- a/program/lib/html2text.php
+++ b/program/lib/html2text.php
@@ -201,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
@@ -247,11 +247,11 @@ class html2text
* @see $pre_replace
*/
var $pre_search = array(
- "/\n/",
- "/\t/",
- '/ /',
- '/<pre[^>]*>/',
- '/<\/pre>/'
+ "/\n/",
+ "/\t/",
+ '/ /',
+ '/<pre[^>]*>/',
+ '/<\/pre>/'
);
/**
@@ -262,11 +262,11 @@ class html2text
* @see $pre_search
*/
var $pre_replace = array(
- '<br>',
- '&nbsp;&nbsp;&nbsp;&nbsp;',
- '&nbsp;',
- '',
- ''
+ '<br>',
+ '&nbsp;&nbsp;&nbsp;&nbsp;',
+ '&nbsp;',
+ '',
+ ''
);
/**
@@ -342,10 +342,10 @@ class html2text
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;
}
/**
@@ -359,10 +359,10 @@ class html2text
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;
}
@@ -463,15 +463,15 @@ class html2text
$text = trim(stripslashes($this->html));
- // Convert <PRE>
+ // Convert <PRE>
$this->_convert_pre($text);
// 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');
+ // 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);
@@ -547,11 +547,10 @@ class html2text
*/
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);
+ }
}
/**
@@ -563,18 +562,17 @@ class html2text
*/
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]);
+ }
}
/**
@@ -586,10 +584,10 @@ class html2text
*/
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);
}
}