From 7ac2aea8764fcf53fe6e8611eb6a9a41e104ef42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Fri, 20 Jul 2018 23:13:40 +0200 Subject: [PATCH 1/4] [blockem] Cleanups: - used `use Friendica\App;` - used proper type-hints - added spaces and curly braces for better readability --- blockem/blockem.php | 149 ++++++++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 67 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index 3de7be40..8069b8f1 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -4,8 +4,10 @@ * Description: Allows users to hide content by collapsing posts and replies. * Version: 1.0 * Author: Mike Macgirvin - * + * Author: Roland Haeder */ + +use Friendica\App; use Friendica\Core\Addon; use Friendica\Core\L10n; use Friendica\Core\PConfig; @@ -13,40 +15,41 @@ 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'); + 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() { 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'); + 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 (App $a, &$s) { - - if(! local_user()) + if (! local_user()) { return; + } /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; $words = PConfig::get(local_user(), 'blockem', 'words'); - if(! $words) + + if (! $words) { $words = ''; + } $s .= ''; $s .= '

' . L10n::t('"Blockem"') . '

'; @@ -68,35 +71,37 @@ function blockem_addon_settings(&$a, &$s) } -function blockem_addon_settings_post(&$a,&$b) { +function blockem_addon_settings_post(App $a, array &$b) { - if(! local_user()) + if (! local_user()) { return; + } - if($_POST['blockem-submit']) { - PConfig::set(local_user(),'blockem','words',trim($_POST['blockem-words'])); + if ($_POST['blockem-submit']) { + PConfig::set(local_user(), 'blockem', 'words', trim($_POST['blockem-words'])); info(L10n::t('BLOCKEM Settings saved.') . EOL); } } -function blockem_enotify_store(&$a,&$b) { +function blockem_enotify_store(App $a, array &$b) { - $words = PConfig::get($b['uid'],'blockem','words'); - if($words) { - $arr = explode(',',$words); - } - else { + $words = PConfig::get($b['uid'], 'blockem', 'words'); + + if ($words) { + $arr = explode(',', $words); + } else { return; } $found = false; - if(count($arr)) { - foreach($arr as $word) { - if(! strlen(trim($word))) { + + if (count($arr)) { + foreach ($arr as $word) { + if (!strlen(trim($word))) { continue; } - if(link_compare($b['url'],$word)) { + if (link_compare($b['url'], $word)) { $found = true; break; } @@ -107,7 +112,7 @@ function blockem_enotify_store(&$a,&$b) { } } -function blockem_prepare_body_content_filter(\Friendica\App $a, &$hook_data) +function blockem_prepare_body_content_filter(App $a, array &$hook_data) { if (!local_user()) { return; @@ -137,24 +142,25 @@ function blockem_prepare_body_content_filter(\Friendica\App $a, &$hook_data) } } -function blockem_display_item(&$a,&$b) { - if (empty($b['output']['body'])) { - return; - } - - if(strstr($b['output']['body'],'id="blockem-wrap-')) +function blockem_display_item(App $a, array &$b = null) +{ + if (isset($b['output']) && strstr($b['output']['body'], 'id="blockem-wrap-')) { $b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg"; + } } -function blockem_conversation_start(&$a,&$b) { - - if(! local_user()) +function blockem_conversation_start(App $a, array &$b) +{ + if (! local_user()) { return; - - $words = PConfig::get(local_user(),'blockem','words'); - if($words) { - $a->data['blockem'] = explode(',',$words); } + + $words = PConfig::get(local_user(), 'blockem', 'words'); + + if ($words) { + $a->data['blockem'] = explode(',', $words); + } + $a->page['htmlhead'] .= <<< EOT EOT; - } -function blockem_item_photo_menu(&$a,&$b) { - - if((! local_user()) || ($b['item']['self'])) +function blockem_item_photo_menu(App $a, array &$b) +{ + if ((! local_user()) || ($b['item']['self'])) { return; + } $blocked = false; $author = $b['item']['author-link']; - if(!empty($a->data['blockem'])) { + + if (!empty($a->data['blockem'])) { foreach($a->data['blockem'] as $bloke) { - if(link_compare($bloke,$author)) { + if (link_compare($bloke,$author)) { $blocked = true; break; } } } - if($blocked) + if ($blocked) { $b['menu'][L10n::t('Unblock Author')] = 'javascript:blockemUnblock(\'' . $author . '\');'; - else + } else { $b['menu'][L10n::t('Block Author')] = 'javascript:blockemBlock(\'' . $author . '\');'; + } } -function blockem_module() {} +function blockem_module() +{ +} - -function blockem_init(&$a) { - - if(! local_user()) +function blockem_init(App $a) +{ + if (! local_user()) { return; + } $words = PConfig::get(local_user(),'blockem','words'); - if(array_key_exists('block',$_GET) && $_GET['block']) { - if(strlen($words)) + if (array_key_exists('block', $_GET) && $_GET['block']) { + if (strlen($words)) { $words .= ','; + } + $words .= trim($_GET['block']); } - if(array_key_exists('unblock',$_GET) && $_GET['unblock']) { + + if (array_key_exists('unblock', $_GET) && $_GET['unblock']) { $arr = explode(',',$words); $newarr = []; - if(count($arr)) { - foreach($arr as $x) { - if(! link_compare(trim($x),trim($_GET['unblock']))) + if (count($arr)) { + foreach ($arr as $x) { + if (! link_compare(trim($x),trim($_GET['unblock']))) { $newarr[] = $x; + } } } + $words = implode(',',$newarr); } - PConfig::set(local_user(),'blockem','words',$words); + PConfig::set(local_user(), 'blockem', 'words', $words); info(L10n::t('blockem settings updated') . EOL ); killme(); } -- 2.45.3 From e54c99b31384f2631392e396079f1dde45dccd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Fri, 20 Jul 2018 23:20:11 +0200 Subject: [PATCH 2/4] [blockem] Moved open curly braces to new line --- blockem/blockem.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index 8069b8f1..f98366f4 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -71,8 +71,8 @@ function blockem_addon_settings (App $a, &$s) } -function blockem_addon_settings_post(App $a, array &$b) { - +function blockem_addon_settings_post(App $a, array &$b) +{ if (! local_user()) { return; } @@ -83,8 +83,8 @@ function blockem_addon_settings_post(App $a, array &$b) { } } -function blockem_enotify_store(App $a, array &$b) { - +function blockem_enotify_store(App $a, array &$b) +{ $words = PConfig::get($b['uid'], 'blockem', 'words'); if ($words) { -- 2.45.3 From 9b5ab3b37366b380e072fb9a494dd512b0d68128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Fri, 20 Jul 2018 23:25:50 +0200 Subject: [PATCH 3/4] [blockem]: - changed checking condition (CR request) - added/removed more spaces --- blockem/blockem.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index f98366f4..f0b0037e 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -107,7 +107,8 @@ function blockem_enotify_store(App $a, array &$b) } } } - if($found) { + + if ($found) { $b['abort'] = true; } } @@ -119,6 +120,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data) } $profiles_string = null; + if (local_user()) { $profiles_string = PConfig::get(local_user(), 'blockem', 'words'); } @@ -130,6 +132,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data) } $found = false; + foreach ($profiles_array as $word) { if (link_compare($hook_data['item']['author-link'], trim($word))) { $found = true; @@ -144,7 +147,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data) function blockem_display_item(App $a, array &$b = null) { - if (isset($b['output']) && strstr($b['output']['body'], 'id="blockem-wrap-')) { + if (!empty($b['output']['body']) && strstr($b['output']['body'], 'id="blockem-wrap-')) { $b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg"; } } @@ -213,7 +216,7 @@ function blockem_init(App $a) return; } - $words = PConfig::get(local_user(),'blockem','words'); + $words = PConfig::get(local_user(), 'blockem', 'words'); if (array_key_exists('block', $_GET) && $_GET['block']) { if (strlen($words)) { @@ -229,13 +232,13 @@ function blockem_init(App $a) if (count($arr)) { foreach ($arr as $x) { - if (! link_compare(trim($x),trim($_GET['unblock']))) { + if (!link_compare(trim($x), trim($_GET['unblock']))) { $newarr[] = $x; } } } - $words = implode(',',$newarr); + $words = implode(',', $newarr); } PConfig::set(local_user(), 'blockem', 'words', $words); -- 2.45.3 From 1bff1a3bf189ed5182d3d4070e855c747280fb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Sat, 21 Jul 2018 03:00:21 +0200 Subject: [PATCH 4/4] [blockem]: converted 4 spaces -> tab --- blockem/blockem.php | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index f0b0037e..364156ee 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -41,9 +41,8 @@ function blockem_addon_settings (App $a, &$s) return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; - + /* Add our stylesheet to the page so we can make our settings look nice */ + $a->page['htmlhead'] .= '' . "\r\n"; $words = PConfig::get(local_user(), 'blockem', 'words'); @@ -51,21 +50,21 @@ function blockem_addon_settings (App $a, &$s) $words = ''; } - $s .= ''; - $s .= '

' . L10n::t('"Blockem"') . '

'; - $s .= ''; - $s .= ''; return; -- 2.45.3