X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flockview.php;h=e48debfc6b2c8b3b0f61758945fd8ab6c207590d;hb=4683cfee123904032cebc5b6d6719c8c712caa24;hp=a2301b4ccb7e73e20b47862cc62fe74929477152;hpb=306688057d64a156969eff79fff546c82d8e616a;p=friendica.git
diff --git a/mod/lockview.php b/mod/lockview.php
index a2301b4ccb..e48debfc6b 100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -1,11 +1,29 @@
.
+ *
*/
+
use Friendica\App;
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Group;
use Friendica\Model\Item;
function lockview_content(App $a)
@@ -19,11 +37,11 @@ function lockview_content(App $a)
}
if (!$item_id) {
- killme();
+ exit();
}
if (!in_array($type, ['item','photo','event'])) {
- killme();
+ exit();
}
$fields = ['uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
@@ -37,36 +55,51 @@ function lockview_content(App $a)
}
if (!DBA::isResult($item)) {
- killme();
+ exit();
}
- Addon::callHooks('lockview_content', $item);
+ Hook::callAll('lockview_content', $item);
if ($item['uid'] != local_user()) {
- echo L10n::t('Remote privacy information not available.') . '
';
- killme();
+ echo DI::l10n()->t('Remote privacy information not available.') . '
';
+ exit();
}
if (isset($item['private'])
- && $item['private'] == 1
+ && $item['private'] == Item::PRIVATE
&& empty($item['allow_cid'])
&& empty($item['allow_gid'])
&& empty($item['deny_cid'])
&& empty($item['deny_gid']))
{
- echo L10n::t('Remote privacy information not available.') . '
';
- killme();
+ echo DI::l10n()->t('Remote privacy information not available.') . '
';
+ exit();
}
- $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:') . '
';
+ $o = DI::l10n()->t('Visible to:') . '
';
$l = [];
if (count($allowed_groups)) {
+ $key = array_search(Group::FOLLOWERS, $allowed_groups);
+ if ($key !== false) {
+ $l[] = '' . DI::l10n()->t('Followers') . '';
+ unset($allowed_groups[$key]);
+ }
+
+ $key = array_search(Group::MUTUALS, $allowed_groups);
+ if ($key !== false) {
+ $l[] = '' . DI::l10n()->t('Mutuals') . '';
+ unset($allowed_groups[$key]);
+ }
+
+
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
DBA::escape(implode(', ', $allowed_groups))
);
@@ -89,6 +122,18 @@ function lockview_content(App $a)
}
if (count($deny_groups)) {
+ $key = array_search(Group::FOLLOWERS, $deny_groups);
+ if ($key !== false) {
+ $l[] = '' . DI::l10n()->t('Followers') . '';
+ unset($deny_groups[$key]);
+ }
+
+ $key = array_search(Group::MUTUALS, $deny_groups);
+ if ($key !== false) {
+ $l[] = '' . DI::l10n()->t('Mutuals') . '';
+ unset($deny_groups[$key]);
+ }
+
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
DBA::escape(implode(', ', $deny_groups))
);
@@ -111,6 +156,6 @@ function lockview_content(App $a)
}
echo $o . implode(', ', $l);
- killme();
+ exit();
}