Merge pull request #927 from nupplaphil/task/replace_getClass

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

diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index 623d4172a2d72ba2b8efeba8879f7032cd625577..7d42c5606295c0078f81f3f3bc3fdda3a8134e0c 100644 (file)
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -7,24 +7,25 @@
  * Status: Unsupported
  */
 
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\Strings;
 
 function remote_permissions_install() {
-       Addon::registerHook('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content');
-       Addon::registerHook('addon_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings');
-       Addon::registerHook('addon_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post');
+       Hook::register('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content');
+       Hook::register('addon_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings');
+       Hook::register('addon_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post');
 }
 
 function remote_permissions_uninstall() {
-       Addon::unregisterHook('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content');
-       Addon::unregisterHook('addon_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings');
-       Addon::unregisterHook('addon_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post');
+       Hook::unregister('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content');
+       Hook::unregister('addon_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings');
+       Hook::unregister('addon_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post');
 }
 
 function remote_permissions_settings(&$a,&$o) {
@@ -123,10 +124,12 @@ function remote_permissions_content($a, $item_copy) {
 
                        $item = $r[0];
 
-                       $allowed_users = expand_acl($item['allow_cid']);
-                       $allowed_groups = expand_acl($item['allow_gid']);
-                       $deny_users = expand_acl($item['deny_cid']);
-                       $deny_groups = expand_acl($item['deny_gid']);
+                       $aclFormatter = DI::aclFormatter();
+
+                       $allowed_users = $aclFormatter->expand($item['allow_cid']);
+                       $allowed_groups = $aclFormatter->expand($item['allow_gid']);
+                       $deny_users = $aclFormatter->expand($item['deny_cid']);
+                       $deny_groups = $aclFormatter->expand($item['deny_gid']);
 
                        $o = L10n::t('Visible to:') . '<br />';
                        $allow = [];
@@ -191,7 +194,7 @@ function remote_permissions_content($a, $item_copy) {
                // Sort the names alphabetically, case-insensitive
                natcasesort($allow_names);
                echo $o . implode(', ', $allow_names);
-               killme();
+               exit();
        }
 
        return;