X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=blockem%2Fblockem.php;h=aaa69399538cd5c2971f5a1890644e09ed175ee8;hb=814edd45411175e03aac12f1faf80bacc9008f85;hp=9134bd0b654fea63fdfaeba3bd3fc01a4d4c4a08;hpb=7ab2c715a4001e9aebbc1db70b5fcac7e61f463f;p=friendica-addons.git

diff --git a/blockem/blockem.php b/blockem/blockem.php
old mode 100755
new mode 100644
index 9134bd0b..aaa69399
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -1,39 +1,40 @@
 <?php
-
-
 /**
  * Name: blockem
- * Description: block people
+ * Description: Allows users to hide content by collapsing posts and replies.
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
+ *
  */
-
-function blockem_install() {
-	register_hook('prepare_body', 'addon/blockem/blockem.php', 'blockem_prepare_body');
-	register_hook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item');
-	register_hook('plugin_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings');
-	register_hook('plugin_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
-	register_hook('conversation_start', 'addon/blockem/blockem.php', 'blockem_conversation_start');
-	register_hook('item_photo_menu', 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+
+function blockem_install()
+{
+	Addon::registerHook('prepare_body_content_filter', 'addon/blockem/blockem.php', 'blockem_prepare_body_content_filter');
+	Addon::registerHook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item');
+	Addon::registerHook('addon_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings');
+	Addon::registerHook('addon_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
+	Addon::registerHook('conversation_start', 'addon/blockem/blockem.php', 'blockem_conversation_start');
+	Addon::registerHook('item_photo_menu', 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
+	Addon::registerHook('enotify_store', 'addon/blockem/blockem.php', 'blockem_enotify_store');
 }
 
-
-function blockem_uninstall() {
-	unregister_hook('prepare_body', 'addon/blockem/blockem.php', 'blockem_prepare_body');
-	unregister_hook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item');
-	unregister_hook('plugin_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings');
-	unregister_hook('plugin_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
-	unregister_hook('conversation_start', 'addon/blockem/blockem.php', 'blockem_conversation_start');
-	unregister_hook('item_photo_menu', 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
-
+function blockem_uninstall()
+{
+	Addon::unregisterHook('prepare_body_content_filter', 'addon/blockem/blockem.php', 'blockem_prepare_body_content_filter');
+	Addon::unregisterHook('prepare_body', 'addon/blockem/blockem.php', 'blockem_prepare_body');
+	Addon::unregisterHook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item');
+	Addon::unregisterHook('addon_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings');
+	Addon::unregisterHook('addon_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
+	Addon::unregisterHook('conversation_start', 'addon/blockem/blockem.php', 'blockem_conversation_start');
+	Addon::unregisterHook('item_photo_menu', 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
+	Addon::unregisterHook('enotify_store', 'addon/blockem/blockem.php', 'blockem_enotify_store');
 }
 
-
-
-
-
-function blockem_addon_settings(&$a,&$s) {
+function blockem_addon_settings(&$a, &$s)
+{
 
 	if(! local_user())
 		return;
@@ -43,18 +44,25 @@ function blockem_addon_settings(&$a,&$s) {
     $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/blockem/blockem.css' . '" media="all" />' . "\r\n";
 
 
-	$words = get_pconfig(local_user(),'blockem','words');
+	$words = PConfig::get(local_user(), 'blockem', 'words');
 	if(! $words)
 		$words = '';
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('"Blockem" Settings') . '</h3>';
+    $s .= '<span id="settings_blockem_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
+    $s .= '<h3>' . L10n::t('"Blockem"') . '</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_blockem_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
+    $s .= '<h3>' . L10n::t('"Blockem"') . '</h3>';
+    $s .= '</span>';
+
     $s .= '<div id="blockem-wrapper">';
-    $s .= '<label id="blockem-label" for="blockem-words">' . t('Comma separated profile URLS to block') . ' </label>';
+    $s .= '<div id="blockem-desc">'. L10n::t("Hides user's content by collapsing posts. Also replaces their avatar with generic image.") . ' </div>';
+    $s .= '<label id="blockem-label" for="blockem-words">' . L10n::t('Comma separated profile URLS:') . ' </label>';
     $s .= '<textarea id="blockem-words" type="text" name="blockem-words" >' . htmlspecialchars($words) . '</textarea>';
     $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blockem-submit" name="blockem-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blockem-submit" name="blockem-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
 	return;
 
@@ -66,20 +74,14 @@ function blockem_addon_settings_post(&$a,&$b) {
 		return;
 
 	if($_POST['blockem-submit']) {
-		set_pconfig(local_user(),'blockem','words',trim($_POST['blockem-words']));
-		info( t('BLOCKEM Settings saved.') . EOL);
+		PConfig::set(local_user(),'blockem','words',trim($_POST['blockem-words']));
+		info(L10n::t('BLOCKEM Settings saved.') . EOL);
 	}
 }
 
-function blockem_prepare_body(&$a,&$b) {
+function blockem_enotify_store(&$a,&$b) {
 
-	if(! local_user())
-		return;
-
-	$words = null;
-	if(local_user()) {
-		$words = get_pconfig(local_user(),'blockem','words');
-	}
+	$words = PConfig::get($b['uid'],'blockem','words');
 	if($words) {
 		$arr = explode(',',$words);
 	}
@@ -94,31 +96,58 @@ function blockem_prepare_body(&$a,&$b) {
 				continue;
 			}
 
-			if(link_compare($b['item']['author-link'],$word)) {
+			if(link_compare($b['url'],$word)) {
 				$found = true;
 				break;
 			}
 		}
 	}
 	if($found) {
-		$rnd = random_string(8);
-		$b['html'] = '<div id="blockem-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'blockem-' . $rnd . '\'); >' . sprintf( t('Blocked %s - Click to open/close'),$word ) . '</div><div id="blockem-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';  
+		$b['abort'] = true;
 	}
 }
 
+function blockem_prepare_body_content_filter(\Friendica\App $a, &$hook_data)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	$profiles_string = null;
+	if (local_user()) {
+		$profiles_string = PConfig::get(local_user(), 'blockem', 'words');
+	}
+
+	if ($profiles_string) {
+		$profiles_array = explode(',', $profiles_string);
+	} else {
+		return;
+	}
+
+	$found = false;
+	foreach ($profiles_array as $word) {
+		if (link_compare($hook_data['item']['author-link'], trim($word))) {
+			$found = true;
+			break;
+		}
+	}
+
+	if ($found) {
+		$hook_data['filter_reasons'][] = L10n::t('Filtered user: %s', $hook_data['item']['author-name']);
+	}
+}
 
 function blockem_display_item(&$a,&$b) {
 	if(strstr($b['output']['body'],'id="blockem-wrap-'))
-		$b['output']['thumb'] = $a->get_baseurl() . "/images/default-profile-sm.jpg";
+		$b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg";
 }
 
-
 function blockem_conversation_start(&$a,&$b) {
 
 	if(! local_user())
 		return;
 
-	$words = get_pconfig(local_user(),'blockem','words');
+	$words = PConfig::get(local_user(),'blockem','words');
 	if($words) {
 		$a->data['blockem'] = explode(',',$words);
 	}
@@ -157,9 +186,9 @@ function blockem_item_photo_menu(&$a,&$b) {
 		}
 	}
 	if($blocked)
-		$b['menu'][ t('Unblock Author')] = 'javascript:blockemUnblock("' . $author . '");';
+		$b['menu'][L10n::t('Unblock Author')] = 'javascript:blockemUnblock(\'' . $author . '\');';
 	else
-		$b['menu'][ t('Block Author')] = 'javascript:blockemBlock("' . $author . '");';
+		$b['menu'][L10n::t('Block Author')] = 'javascript:blockemBlock(\'' . $author . '\');';
 }
 
 function blockem_module() {}
@@ -170,7 +199,7 @@ function blockem_init(&$a) {
 	if(! local_user())
 		return;
 
-	$words = get_pconfig(local_user(),'blockem','words');
+	$words = PConfig::get(local_user(),'blockem','words');
 
 	if(array_key_exists('block',$_GET) && $_GET['block']) {
 		if(strlen($words))
@@ -179,7 +208,7 @@ function blockem_init(&$a) {
 	}
 	if(array_key_exists('unblock',$_GET) && $_GET['unblock']) {
 		$arr = explode(',',$words);
-		$newarr = array();
+		$newarr = [];
 
 		if(count($arr)) {
 			foreach($arr as $x) {
@@ -190,7 +219,7 @@ function blockem_init(&$a) {
 		$words = implode(',',$newarr);
 	}
 
-	set_pconfig(local_user(),'blockem','words',$words);
-	info( t('blockem settings updated') . EOL );
+	PConfig::set(local_user(),'blockem','words',$words);
+	info(L10n::t('blockem settings updated') . EOL );
 	killme();
 }