Merge remote-tracking branch 'upstream/develop' into media

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

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 7a446ec..c0f581e 100644 (file)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -8,8 +8,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
@@ -20,13 +18,6 @@ function showmore_install()
        Hook::register('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
 }
 
-function showmore_uninstall()
-{
-       Hook::unregister('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
-       Hook::unregister('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
-       Hook::unregister('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
-}
-
 function showmore_addon_settings(&$a, &$s)
 {
        if (!local_user()) {
@@ -35,30 +26,30 @@ function showmore_addon_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
 
-       $enable_checked = (intval(PConfig::get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"');
-       $chars = PConfig::get(local_user(), 'showmore', 'chars', 1100);
+       $enable_checked = (intval(DI::pConfig()->get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"');
+       $chars = DI::pConfig()->get(local_user(), 'showmore', 'chars', 1100);
 
        $s .= '<span id="settings_showmore_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_showmore_expanded\'); openClose(\'settings_showmore_inflated\');">';
-       $s .= '<h3>' . L10n::t('"Show more" Settings').'</h3>';
+       $s .= '<h3>' . DI::l10n()->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>' . L10n::t('"Show more" Settings').'</h3>';
+       $s .= '<h3>' . DI::l10n()->t('"Show more" Settings').'</h3>';
        $s .= '</span>';
 
        $s .= '<div id="showmore-wrapper">';
 
-       $s .= '<label id="showmore-enable-label" for="showmore-enable">'.L10n::t('Enable Show More').'</label>';
+       $s .= '<label id="showmore-enable-label" for="showmore-enable">'.DI::l10n()->t('Enable Show More').'</label>';
        $s .= '<input id="showmore-enable" type="checkbox" name="showmore-enable" value="1"'.$enable_checked.' />';
        $s .= '<div class="clear"></div>';
-       $s .= '<label id="showmore-label" for="showmore-chars">'.L10n::t('Cutting posts after how much characters').' </label>';
+       $s .= '<label id="showmore-label" for="showmore-chars">'.DI::l10n()->t('Cutting posts after how much characters').' </label>';
        $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="' . L10n::t('Save Settings') . '" /></div>';
-//     $s .= '<div class="showmore-desc">' . L10n::t('Use /expression/ to provide regular expressions') . '</div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="showmore-submit" name="showmore-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
+//     $s .= '<div class="showmore-desc">' . DI::l10n()->t('Use /expression/ to provide regular expressions') . '</div>';
        $s .= '</div>';
 
        return;
@@ -71,11 +62,10 @@ function showmore_addon_settings_post(&$a, &$b)
        }
 
        if (!empty($_POST['showmore-submit'])) {
-               PConfig::set(local_user(), 'showmore', 'chars', trim($_POST['showmore-chars']));
+               DI::pConfig()->set(local_user(), 'showmore', 'chars', trim($_POST['showmore-chars']));
                $enable = (!empty($_POST['showmore-enable']) ? intval($_POST['showmore-enable']) : 0);
                $disable = 1-$enable;
-               PConfig::set(local_user(), 'showmore', 'disable', $disable);
-               info(L10n::t('Show More Settings saved.') . EOL);
+               DI::pConfig()->set(local_user(), 'showmore', 'disable', $disable);
        }
 }
 
@@ -91,8 +81,9 @@ function get_body_length($body)
        // 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);
+       $doc = new DOMDocument();
+       @$doc->loadHTML($body);
+       $xpath = new DOMXPath($doc);
 
        /*
         * Checking any possible syntax of the style attribute with xpath is impossible
@@ -106,7 +97,7 @@ function get_body_length($body)
                }
        }
        // Now we can get the body of our HTML DomDocument, it contains only what is visible
-       $string = $dom->saveHTML();
+       $string = $doc->saveHTML();
 
        $string = strip_tags($string);
        return strlen($string);
@@ -119,11 +110,11 @@ function showmore_prepare_body(\Friendica\App $a, &$hook_data)
                return;
        }
 
-       if (PConfig::get(local_user(), 'showmore', 'disable')) {
+       if (DI::pConfig()->get(local_user(), 'showmore', 'disable')) {
                return;
        }
 
-       $chars = (int) PConfig::get(local_user(), 'showmore', 'chars', 1100);
+       $chars = (int) DI::pConfig()->get(local_user(), 'showmore', 'chars', 1100);
 
        if (get_body_length($hook_data['html']) > $chars) {
                $found = true;
@@ -134,9 +125,9 @@ function showmore_prepare_body(\Friendica\App $a, &$hook_data)
 
        if ($found) {
                $rnd = Strings::getRandomHex(8);
-               $hook_data['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 . '\');" >' . L10n::t('show more') . '</span></span>' .
-                       '<div id="showmore-' . $rnd . '" class="showmore-content" style="display: none;">' . $hook_data['html'] . '</div>';
+               $hook_data['html'] = '<span id="showmore-teaser-' . $rnd . '" class="showmore-teaser" style="display: block;" aria-hidden="true">' . $shortened . " " .
+                       '<span id="showmore-wrap-' . $rnd . '" style="white-space:nowrap;" class="showmore-wrap fakelink" onclick="openClose(\'showmore-' . $rnd . '\'); openClose(\'showmore-teaser-' . $rnd . '\');" >' . DI::l10n()->t('show more') . '</span></span>' .
+                       '<div id="showmore-' . $rnd . '" class="showmore-content" style="display: none;" aria-hidden="false">' . $hook_data['html'] . '</div>';
        }
 }