X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flockview.php;h=fc9fed306699ac270151915a4420794fac3fd3b7;hb=30a4b0eafb8c1947852c7a44f1c417481e9c49d3;hp=893764c4d9fa3266b6e22145eddca365ea191a09;hpb=986106a8f7d0b58a2b2834b082301a426bc98999;p=friendica.git

diff --git a/mod/lockview.php b/mod/lockview.php
index 893764c4d9..fc9fed3066 100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -3,99 +3,143 @@
  * @file mod/lockview.php
  */
 use Friendica\App;
-use Friendica\Core\Addon;
+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) {
-
+function lockview_content(App $a)
+{
 	$type = (($a->argc > 1) ? $a->argv[1] : 0);
 	if (is_numeric($type)) {
 		$item_id = intval($type);
-		$type='item';
+		$type = 'item';
 	} else {
 		$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
 	}
 
-	if (!$item_id)
-		killme();
+	if (!$item_id) {
+		exit();
+	}
 
-	if (!in_array($type, ['item','photo','event']))
-		killme();
+	if (!in_array($type, ['item','photo','event'])) {
+		exit();
+	}
 
-	$fields = ['uid', 'private', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
+	$fields = ['uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
 	$condition = ['id' => $item_id];
+
 	if ($type != 'item') {
 		$item = DBA::selectFirst($type, $fields, $condition);
 	} else {
+		$fields[] = 'private';
 		$item = Item::selectFirst($fields, $condition);
 	}
 
 	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();
+		exit();
 	}
 
-
-	if (($item['private'] == 1) && empty($item['allow_cid']) && empty($item['allow_gid'])
-		&& empty($item['deny_cid']) && empty($item['deny_gid'])) {
-
+	if (isset($item['private'])
+		&& $item['private'] == 1
+		&& 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();
+		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 />';
 	$l = [];
 
 	if (count($allowed_groups)) {
+		$key = array_search(Group::FOLLOWERS, $allowed_groups);
+		if ($key !== false) {
+			$l[] = '<b>' . L10n::t('Followers') . '</b>';
+			unset($allowed_groups[$key]);
+		}
+
+		$key = array_search(Group::MUTUALS, $allowed_groups);
+		if ($key !== false) {
+			$l[] = '<b>' . L10n::t('Mutuals') . '</b>';
+			unset($allowed_groups[$key]);
+		}
+
+
 		$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
 			DBA::escape(implode(', ', $allowed_groups))
 		);
-		if (DBA::isResult($r))
-			foreach($r as $rr)
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
 				$l[] = '<b>' . $rr['name'] . '</b>';
+			}
+		}
 	}
+
 	if (count($allowed_users)) {
 		$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
-			DBA::escape(implode(', ',$allowed_users))
+			DBA::escape(implode(', ', $allowed_users))
 		);
-		if (DBA::isResult($r))
-			foreach($r as $rr)
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
 				$l[] = $rr['name'];
-
+			}
+		}
 	}
 
 	if (count($deny_groups)) {
+		$key = array_search(Group::FOLLOWERS, $deny_groups);
+		if ($key !== false) {
+			$l[] = '<b><strike>' . L10n::t('Followers') . '</strike></b>';
+			unset($deny_groups[$key]);
+		}
+
+		$key = array_search(Group::MUTUALS, $deny_groups);
+		if ($key !== false) {
+			$l[] = '<b><strike>' . L10n::t('Mutuals') . '</strike></b>';
+			unset($deny_groups[$key]);
+		}
+
 		$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
 			DBA::escape(implode(', ', $deny_groups))
 		);
-		if (DBA::isResult($r))
-			foreach($r as $rr)
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
 				$l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
+			}
+		}
 	}
+
 	if (count($deny_users)) {
 		$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
-			DBA::escape(implode(', ',$deny_users))
+			DBA::escape(implode(', ', $deny_users))
 		);
-		if (DBA::isResult($r))
-			foreach($r as $rr)
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
 				$l[] = '<strike>' . $rr['name'] . '</strike>';
-
+			}
+		}
 	}
 
 	echo $o . implode(', ', $l);
-	killme();
+	exit();
 
 }