friendica/friendica-addons
7
2
Fork 13
Code Issues 3 Pull requests 2 Releases 16 Wiki Activity

[remote_permissions] Move expand_acl to ACLFormatter::expand() #904

Merged
nupplaphil merged 1 commit from task/move_text into develop 2019-10-24 14:04:32 +02:00
Conversation 1 Commits 1 Files changed 1 +9 -4
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
remote_permissions/remote_permissions.php
View file

@ -7,12 +7,14 @@
* Status: Unsupported * Status: Unsupported
*/ */
use Friendica\BaseObject;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\ACLFormatter;
use Friendica\Util\Strings; use Friendica\Util\Strings;
function remote_permissions_install() { function remote_permissions_install() {
@ -123,10 +125,13 @@ function remote_permissions_content($a, $item_copy) {
$item = $r[0]; $item = $r[0];
$allowed_users = expand_acl($item['allow_cid']); /** @var ACLFormatter $aclFormatter */
$allowed_groups = expand_acl($item['allow_gid']); $aclFormatter = BaseObject::getClass(ACLFormatter::class);
$deny_users = expand_acl($item['deny_cid']);
$deny_groups = expand_acl($item['deny_gid']); $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 />'; $o = L10n::t('Visible to:') . '<br />';
$allow = []; $allow = [];