mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2024-11-25 10:03:45 +00:00
Move expand_acl to ACLFormatter::expand()
- including tests
This commit is contained in:
parent
1f0e3ee604
commit
94893d8960
1 changed files with 9 additions and 4 deletions
|
@ -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 = [];
|
||||||
|
|
Loading…
Reference in a new issue