X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flockview.php;h=e48debfc6b2c8b3b0f61758945fd8ab6c207590d;hb=ca9f8e7420d925fb316f8841f338a4583d94fe51;hp=a2301b4ccb7e73e20b47862cc62fe74929477152;hpb=91f405bac4ae94bc883ab1dd32df468fc7eae324;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 @@
 <?php
 /**
- * @file mod/lockview.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 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.') . '<br />';
-		killme();
+		echo DI::l10n()->t('Remote privacy information not available.') . '<br />';
+		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.') . '<br />';
-		killme();
+		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();
+
+	$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 = 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 +122,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))
 		);
@@ -111,6 +156,6 @@ function lockview_content(App $a)
 	}
 
 	echo $o . implode(', ', $l);
-	killme();
+	exit();
 
 }