Merge pull request #363 from rabuzarus/1308-notifyall

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

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 5b0f14a0c38fe39c7ecf954bde8a03bcad34acd1..a9d8334f3e41dea7532d2df1d11599cf95fb2a70 100755 (executable)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -34,8 +34,14 @@ function showmore_addon_settings(&$a,&$s) {
        if(!$chars)
                $chars = '1100';
 
-       $s .= '<div class="settings-block">';
+       $s .= '<span id="settings_showmore_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_showmore_expanded\'); openClose(\'settings_showmore_inflated\');">';
        $s .= '<h3>' . t('"Show more" Settings').'</h3>';
+       $s .= '</span>';
+       $s .= '<div id="settings_showmore_expanded" class="settings-block" style="display: none;">';
+       $s .= '<span class="fakelink" onclick="openClose(\'settings_showmore_expanded\'); openClose(\'settings_showmore_inflated\');">';
+       $s .= '<h3>' . t('"Show more" Settings').'</h3>';
+       $s .= '</span>';
+
        $s .= '<div id="showmore-wrapper">';
 
        $s .= '<label id="showmore-enable-label" for="showmore-enable">'.t('Enable Show More').'</label>';
@@ -45,7 +51,7 @@ function showmore_addon_settings(&$a,&$s) {
        $s .= '<input id="showmore-words" type="text" name="showmore-chars" value="'.$chars.'" />';
        $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="settings-submit-wrapper" ><input type="submit" id="showmore-submit" name="showmore-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 //     $s .= '<div class="showmore-desc">' . t('Use /expression/ to provide regular expressions') . '</div>';
        $s .= '</div>';
 
@@ -69,8 +75,15 @@ 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)
-       $dom = DomDocument::loadHTML($body);
+
+       // Get rid of the warning. It would be better to have some valid html as input
+       $dom = @DomDocument::loadHTML($body);
        $xpath = new DOMXPath($dom);
 
        /*
@@ -108,9 +121,9 @@ 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>'.
-                               '<div id="showmore-'.$rnd.'" style="display: none;">'.$b['html'].'</div>';
+               $b['html'] = '<span id="showmore-teaser-'.$rnd.'" class="showmore-teaser" style="display: block;">'.$shortened." ".
+                               '<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="showmore-wrap fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('show more')).'</span></span>'.
+                               '<div id="showmore-'.$rnd.'" class="showmore-content" style="display: none;">'.$b['html'].'</div>';
        }
 }