X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=showmore%2Fshowmore.php;h=e7140d193637031783157f8b9d6b59eb4c3572f2;hb=c48776586093e178c9ea94183e44b978456bebf1;hp=096fd3f704b69e3f825daeffdc84048967e4beb0;hpb=a3de3d8008f6f90a378a1f8adf2b8b5720d3b2cb;p=friendica-addons.git

diff --git a/showmore/showmore.php b/showmore/showmore.php
old mode 100755
new mode 100644
index 096fd3f7..e7140d19
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -7,68 +7,85 @@
  *         based upon NSFW from Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
-
-function showmore_install() {
-	register_hook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
-	register_hook('plugin_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
-	register_hook('plugin_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+
+function showmore_install()
+{
+	Addon::registerHook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
+	Addon::registerHook('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
+	Addon::registerHook('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
 }
 
-function showmore_uninstall() {
-	unregister_hook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
-	unregister_hook('plugin_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
-	unregister_hook('plugin_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
+function showmore_uninstall()
+{
+	Addon::unregisterHook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
+	Addon::unregisterHook('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
+	Addon::unregisterHook('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
 }
 
-function showmore_addon_settings(&$a,&$s) {
-
-	if(! local_user())
+function showmore_addon_settings(&$a, &$s)
+{
+	if (!local_user()) {
 		return;
+	}
 
 	/* Add our stylesheet to the page so we can make our settings look nice */
 
 	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
 
-	$enable_checked = (intval(get_pconfig(local_user(),'showmore','disable')) ? '' : ' checked="checked"');
-	$chars = get_pconfig(local_user(),'showmore','chars');
-	if(!$chars)
-		$chars = '1100';
+	$enable_checked = (intval(PConfig::get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"');
+	$chars = 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 .= '</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 .= '</span>';
 
-	$s .= '<div class="settings-block">';
-	$s .= '<h3>' . t('"Show more" Settings').'</h3>';
 	$s .= '<div id="showmore-wrapper">';
 
-	$s .= '<label id="showmore-enable-label" for="showmore-enable">'.t('Enable Show More').'</label>';
+	$s .= '<label id="showmore-enable-label" for="showmore-enable">'.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">'.t('Cutting posts after how much characters').' </label>';
+	$s .= '<label id="showmore-label" for="showmore-chars">'.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="' . t('Submit') . '" /></div>';
-//	$s .= '<div class="showmore-desc">' . 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="' . L10n::t('Save Settings') . '" /></div>';
+//	$s .= '<div class="showmore-desc">' . L10n::t('Use /expression/ to provide regular expressions') . '</div>';
 	$s .= '</div>';
 
 	return;
 }
 
-function showmore_addon_settings_post(&$a,&$b) {
-
-	if(! local_user())
+function showmore_addon_settings_post(&$a, &$b)
+{
+	if (!local_user()) {
 		return;
+	}
 
-	if($_POST['showmore-submit']) {
-		set_pconfig(local_user(),'showmore','chars',trim($_POST['showmore-chars']));
-		$enable = ((x($_POST,'showmore-enable')) ? intval($_POST['showmore-enable']) : 0);
+	if (!empty($_POST['showmore-submit'])) {
+		PConfig::set(local_user(), 'showmore', 'chars', trim($_POST['showmore-chars']));
+		$enable = (x($_POST, 'showmore-enable') ? intval($_POST['showmore-enable']) : 0);
 		$disable = 1-$enable;
-		set_pconfig(local_user(),'showmore','disable', $disable);
-		info( t('Show More Settings saved.') . EOL);
+		PConfig::set(local_user(), 'showmore', 'disable', $disable);
+		info(L10n::t('Show More Settings saved.') . EOL);
 	}
 }
 
-function get_body_length($body) {
+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
@@ -80,8 +97,8 @@ function get_body_length($body) {
 	 * 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'))) {
+	foreach ($xr as $node) {
+		if (preg_match('/.*display: *none *;.*/',$node->getAttribute('style'))) {
 			// Hidden, remove it from its parent
 			$node->parentNode->removeChild($node);
 		}
@@ -93,30 +110,36 @@ function get_body_length($body) {
 	return strlen($string);
 }
 
-function showmore_prepare_body(&$a,&$b) {
+function showmore_prepare_body(\Friendica\App $a, &$hook_data)
+{
+	// No combination with content filters
+	if (!empty($hook_data['filter_reasons'])) {
+		return;
+	}
 
-	$words = null;
-	if(get_pconfig(local_user(),'showmore','disable'))
+	if (PConfig::get(local_user(), 'showmore', 'disable')) {
 		return;
+	}
 
-	$chars = (int)get_pconfig(local_user(),'showmore','chars');
-	if(!$chars)
-		$chars = 1100;
+	$chars = (int) PConfig::get(local_user(), 'showmore', 'chars', 1100);
 
-	if (get_body_length($b['html']) > $chars) {
+	if (get_body_length($hook_data['html']) > $chars) {
 		$found = true;
-		$shortened = trim(showmore_cutitem($b['html'], $chars))."...";
+		$shortened = trim(showmore_cutitem($hook_data['html'], $chars)) . "...";
+	} else {
+		$found = false;
 	}
 
-	if($found) {
+	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>';
+		$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>';
 	}
 }
 
-function showmore_cutitem($text, $limit) {
+function showmore_cutitem($text, $limit)
+{
 	$text = trim($text);
 
 	$text = mb_convert_encoding($text, 'HTML-ENTITIES', "UTF-8");
@@ -143,7 +166,7 @@ function showmore_cutitem($text, $limit) {
 	@$doc->loadHTML($doctype."<html><body>".$text."</body></html>");
 
 	$text = $doc->saveHTML();
-	$text = str_replace(array("<html><body>", "</body></html>", $doctype), array("", "", ""), $text);
+	$text = str_replace(["<html><body>", "</body></html>", $doctype], ["", "", ""], $text);
 
-	return($text);
+	return $text;
 }