X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=showmore%2Fshowmore.php;h=e39acdeea60cd2498bfd8baafe674f410663af44;hb=eaf1a2e61854bdd25f2741b94d8a4ebf7131fcee;hp=9bddab6337b66b48c20b7c21c93482c48327ce9a;hpb=27b60e003f92dd9f3aebbeddb34ebb905488ca82;p=friendica-addons.git

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 9bddab63..e39acdee 100644
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -7,19 +7,20 @@
  *         based upon NSFW from Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
-
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 
 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');
+	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');
+	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) {
@@ -37,24 +38,24 @@ function showmore_addon_settings(&$a,&$s) {
 		$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>' . t('"Show more" Settings').'</h3>';
+	$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>' . t('"Show more" Settings').'</h3>';
+	$s .= '<h3>' . L10n::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>';
+	$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('Save Settings') . '" /></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;
@@ -70,7 +71,7 @@ function showmore_addon_settings_post(&$a,&$b) {
 		$enable = ((x($_POST,'showmore-enable')) ? intval($_POST['showmore-enable']) : 0);
 		$disable = 1-$enable;
 		PConfig::set(local_user(),'showmore','disable', $disable);
-		info( t('Show More Settings saved.') . EOL);
+		info(L10n::t('Show More Settings saved.') . EOL);
 	}
 }
 
@@ -106,26 +107,32 @@ 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(PConfig::get(local_user(),'showmore','disable'))
+	if (PConfig::get(local_user(), 'showmore', 'disable')) {
 		return;
+	}
 
-	$chars = (int)PConfig::get(local_user(),'showmore','chars');
-	if(!$chars)
+	$chars = (int) PConfig::get(local_user(), 'showmore', 'chars');
+	if (!$chars) {
 		$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)) . "...";
 	}
 
-	if($found) {
+	if ($found) {
 		$rnd = random_string(8);
-		$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>';
+		$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>';
 	}
 }