Statusnet: New intelligent shortening enabled.

[friendica-addons.git] / showmore / showmore.php

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 7842a58e624c8473b4970838f3d9dd800ae2c62e..1f40b027be3b7da947e3905e8a9a817ffd176c7a 100755 (executable)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -46,7 +46,8 @@ function showmore_addon_settings(&$a,&$s) {
        $s .= '</div><div class="clear"></div>';
 
        $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="showmore-submit" name="showmore-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
-//     $s .= '<div class="showmore-desc">' . t('Use /expression/ to provide regular expressions') . '</div></div>';
+//     $s .= '<div class="showmore-desc">' . t('Use /expression/ to provide regular expressions') . '</div>';
+       $s .= '</div>';
 
        return;
 }
@@ -65,6 +66,38 @@ function showmore_addon_settings_post(&$a,&$b) {
        }
 }
 
+function get_body_length($body) {
+       $string = trim($body);
+
+       // DomDocument doesn't like empty strings
+       if(! strlen($string)) {
+               return 0;
+       }
+
+       // We need to get rid of hidden tags (display: none)
+
+       // Get rid of the warning. It would be better to have some valid html as input
+       $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();
+
+       $string = strip_tags($string);
+       return strlen($string);
+}
+
 function showmore_prepare_body(&$a,&$b) {
 
        $words = null;
@@ -75,7 +108,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))."...";
        }
@@ -83,7 +116,7 @@ function showmore_prepare_body(&$a,&$b) {
        if($found) {
                $rnd = random_string(8);
                $b['html'] = '<span id="showmore-teaser-'.$rnd.'" style="display: block;">'.$shortened." ".
-                               '<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('Show More')).'</span></span>'.
+                               '<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('show more')).'</span></span>'.
                                '<div id="showmore-'.$rnd.'" style="display: none;">'.$b['html'].'</div>';
        }
 }