Move Notify::TYPE_MAIL

[friendica.git] / mod / lockview.php

diff --git a/mod/lockview.php b/mod/lockview.php
index 35c4b043329ae4284250d95a398636407a3d5d8e..e3382bddb8bdbbe03f6d9a46ea2001bf9419d7bb 100644 (file)
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -4,8 +4,9 @@
  */
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Group;
 use Friendica\Model\Item;
 
 function lockview_content(App $a)
@@ -43,7 +44,7 @@ function lockview_content(App $a)
        Hook::callAll('lockview_content', $item);
 
        if ($item['uid'] != local_user()) {
-               echo L10n::t('Remote privacy information not available.') . '<br />';
+               echo DI::l10n()->t('Remote privacy information not available.') . '<br />';
                exit();
        }
 
@@ -54,19 +55,34 @@ function lockview_content(App $a)
                && empty($item['deny_cid'])
                && empty($item['deny_gid']))
        {
-               echo L10n::t('Remote privacy information not available.') . '<br />';
+               echo DI::l10n()->t('Remote privacy information not available.') . '<br />';
                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();
 
-       $o = L10n::t('Visible to:') . '<br />';
+       $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 = DI::l10n()->t('Visible to:') . '<br />';
        $l = [];
 
        if (count($allowed_groups)) {
+               $key = array_search(Group::FOLLOWERS, $allowed_groups);
+               if ($key !== false) {
+                       $l[] = '<b>' . DI::l10n()->t('Followers') . '</b>';
+                       unset($allowed_groups[$key]);
+               }
+
+               $key = array_search(Group::MUTUALS, $allowed_groups);
+               if ($key !== false) {
+                       $l[] = '<b>' . DI::l10n()->t('Mutuals') . '</b>';
+                       unset($allowed_groups[$key]);
+               }
+
+
                $r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
                        DBA::escape(implode(', ', $allowed_groups))
                );
@@ -89,6 +105,18 @@ function lockview_content(App $a)
        }
 
        if (count($deny_groups)) {
+               $key = array_search(Group::FOLLOWERS, $deny_groups);
+               if ($key !== false) {
+                       $l[] = '<b><strike>' . DI::l10n()->t('Followers') . '</strike></b>';
+                       unset($deny_groups[$key]);
+               }
+
+               $key = array_search(Group::MUTUALS, $deny_groups);
+               if ($key !== false) {
+                       $l[] = '<b><strike>' . DI::l10n()->t('Mutuals') . '</strike></b>';
+                       unset($deny_groups[$key]);
+               }
+
                $r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
                        DBA::escape(implode(', ', $deny_groups))
                );