X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPermissionTooltip.php;h=f4fd5665022b2c42579f6fe5b6a5e3a0361caa79;hb=3bca4fe2a64671d09e08346456cdfa6c12f996e9;hp=1f41584d65321e4015641a3f06a43439ac6e5f9a;hpb=6394bd91c0f25d9e2c61ca6166a78e9563506554;p=friendica.git

diff --git a/src/Module/PermissionTooltip.php b/src/Module/PermissionTooltip.php
index 1f41584d65..f4fd566502 100644
--- a/src/Module/PermissionTooltip.php
+++ b/src/Module/PermissionTooltip.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,7 +27,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
-use Friendica\Model\Group;
+use Friendica\Model\Circle;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
@@ -79,7 +79,7 @@ class PermissionTooltip extends \Friendica\BaseModule
 			throw new HttpException\NotFoundException(DI::l10n()->t('Model not found'));
 		}
 
-		// Kept for backwards compatiblity
+		// Kept for backwards compatibility
 		Hook::callAll('lockview_content', $model);
 
 		if ($type == 'item') {
@@ -113,29 +113,43 @@ class PermissionTooltip extends \Friendica\BaseModule
 			exit;
 		}
 
-		$allowed_users  = $model['allow_cid'];
-		$allowed_groups = $model['allow_gid'];
-		$deny_users     = $model['deny_cid'];
-		$deny_groups    = $model['deny_gid'];
+		if (!empty($model['allow_cid']) || !empty($model['allow_gid']) || !empty($model['deny_cid']) || !empty($model['deny_gid'])) {
+			$receivers = $this->fetchReceiversFromACL($model);
+		}
+
+		$this->httpExit(DI::l10n()->t('Visible to:') . '<br />' . $receivers);
+	}
+
+	/**
+	 * Fetch a list of receivers based on the ACL data
+	 *
+	 * @param array $model
+	 * @return string
+	 */
+	private function fetchReceiversFromACL(array $model)
+	{
+		$allowed_users   = $model['allow_cid'];
+		$allowed_circles = $model['allow_gid'];
+		$deny_users      = $model['deny_cid'];
+		$deny_circles    = $model['deny_gid'];
 
-		$o = DI::l10n()->t('Visible to:') . '<br />';
 		$l = [];
 
-		if (count($allowed_groups)) {
-			$key = array_search(Group::FOLLOWERS, $allowed_groups);
+		if (count($allowed_circles)) {
+			$key = array_search(Circle::FOLLOWERS, $allowed_circles);
 			if ($key !== false) {
 				$l[] = '<b>' . DI::l10n()->t('Followers') . '</b>';
-				unset($allowed_groups[$key]);
+				unset($allowed_circles[$key]);
 			}
 
-			$key = array_search(Group::MUTUALS, $allowed_groups);
+			$key = array_search(Circle::MUTUALS, $allowed_circles);
 			if ($key !== false) {
 				$l[] = '<b>' . DI::l10n()->t('Mutuals') . '</b>';
-				unset($allowed_groups[$key]);
+				unset($allowed_circles[$key]);
 			}
 
-			foreach (DI::dba()->selectToArray('group', ['name'], ['id' => $allowed_groups]) as $group) {
-				$l[] = '<b>' . $group['name'] . '</b>';
+			foreach (DI::dba()->selectToArray('group', ['name'], ['id' => $allowed_circles]) as $circle) {
+				$l[] = '<b>' . $circle['name'] . '</b>';
 			}
 		}
 
@@ -143,21 +157,21 @@ class PermissionTooltip extends \Friendica\BaseModule
 			$l[] = $contact['name'];
 		}
 
-		if (count($deny_groups)) {
-			$key = array_search(Group::FOLLOWERS, $deny_groups);
+		if (count($deny_circles)) {
+			$key = array_search(Circle::FOLLOWERS, $deny_circles);
 			if ($key !== false) {
 				$l[] = '<b><strike>' . DI::l10n()->t('Followers') . '</strike></b>';
-				unset($deny_groups[$key]);
+				unset($deny_circles[$key]);
 			}
 
-			$key = array_search(Group::MUTUALS, $deny_groups);
+			$key = array_search(Circle::MUTUALS, $deny_circles);
 			if ($key !== false) {
 				$l[] = '<b><strike>' . DI::l10n()->t('Mutuals') . '</strike></b>';
-				unset($deny_groups[$key]);
+				unset($deny_circles[$key]);
 			}
 
-			foreach (DI::dba()->selectToArray('group', ['name'], ['id' => $allowed_groups]) as $group) {
-				$l[] = '<b><strike>' . $group['name'] . '</strike></b>';
+			foreach (DI::dba()->selectToArray('group', ['name'], ['id' => $allowed_circles]) as $circle) {
+				$l[] = '<b><strike>' . $circle['name'] . '</strike></b>';
 			}
 		}
 
@@ -165,11 +179,7 @@ class PermissionTooltip extends \Friendica\BaseModule
 			$l[] = '<strike>' . $contact['name'] . '</strike>';
 		}
 
-		if (!empty($l)) {
-			System::httpExit($o . implode(', ', $l));
-		} else {
-			System::httpExit($o . $receivers);;
-		}
+		return implode(', ', $l);
 	}
 
 	/**
@@ -190,7 +200,7 @@ class PermissionTooltip extends \Friendica\BaseModule
 		}
 
 		$receivers = [];
-		foreach (Tag::getByURIId($uriId, [Tag::TO, Tag::CC, Tag::BCC]) as $receiver) {
+		foreach (Tag::getByURIId($uriId, [Tag::TO, Tag::CC, Tag::BCC, Tag::AUDIENCE, Tag::ATTRIBUTED]) as $receiver) {
 			// We only display BCC when it contains the current user
 			if (($receiver['type'] == Tag::BCC) && ($receiver['url'] != $own_url)) {
 				continue;
@@ -236,6 +246,12 @@ class PermissionTooltip extends \Friendica\BaseModule
 				case Tag::BCC:
 					$output .= DI::l10n()->t('<b>BCC:</b> %s<br>', implode(', ', $receiver));
 					break;
+				case Tag::AUDIENCE:
+					$output .= DI::l10n()->t('<b>Audience:</b> %s<br>', implode(', ', $receiver));
+					break;
+				case Tag::ATTRIBUTED:
+					$output .= DI::l10n()->t('<b>Attributed To:</b> %s<br>', implode(', ', $receiver));
+					break;
 			}
 		}