From 7b786e02149ba01550a4028bcf0e11b8f575d3ec Mon Sep 17 00:00:00 2001 From: Domovoy Date: Mon, 23 Jul 2012 20:07:15 +0200 Subject: [PATCH] showmore now only count what is visible to know if it should act, fixes #1 --- showmore/showmore.php | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/showmore/showmore.php b/showmore/showmore.php index 2b4d5d0f..e4f0de4e 100755 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -66,6 +66,31 @@ function showmore_addon_settings_post(&$a,&$b) { } } +function get_body_length($body) { + $string = trim($body); + + // We need to get rid of hidden tags (display: none) + $dom = DomDocument::loadHTML($body); + $xpath = new DOMXPath($dom); + + /* + * Checking any possible syntax of the style attribute with xpath is impossible + * So we just get any element with a style attribute, and check them with a regexp + */ + $xr = $xpath->query('//*[@style]'); + foreach($xr as $node) { + if(preg_match('/.*display: *none *;.*/',$node->getAttribute('style'))) { + // Hidden, remove it from its parent + $node->parentNode->removeChild($node); + } + } + // Now we can get the body of our HTML DomDocument, it contains only what is visible + $string = $dom->saveHTML($dom->getElementsByTagName('body')->item(0)); + + $string = strip_tags($string); + return strlen($string); +} + function showmore_prepare_body(&$a,&$b) { $words = null; @@ -76,7 +101,7 @@ function showmore_prepare_body(&$a,&$b) { if(!$chars) $chars = 1100; - if (strlen(strip_tags(trim($b['html']))) > $chars) { + if (get_body_length($b['html']) > $chars) { $found = true; $shortened = trim(showmore_cutitem($b['html'], $chars))."..."; }