X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPermissionTooltip.php;h=44176ecf8d3ea002b4ac3507cd579a329b693f33;hb=c18bda9397d0ea9d68ea7a81e6292459317fdbf5;hp=b9429fce231ee65f560dc610b761b5050e7f0dab;hpb=ee5207410c71492b2e771479ff1890d8ef4552da;p=friendica.git

diff --git a/src/Module/PermissionTooltip.php b/src/Module/PermissionTooltip.php
index b9429fce23..44176ecf8d 100644
--- a/src/Module/PermissionTooltip.php
+++ b/src/Module/PermissionTooltip.php
@@ -5,8 +5,8 @@ namespace Friendica\Module;
 use Friendica\Core\Hook;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Item;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 
@@ -15,10 +15,10 @@ use Friendica\Network\HTTPException;
  */
 class PermissionTooltip extends \Friendica\BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	protected function rawContent(array $request = [])
 	{
-		$type = $parameters['type'];
-		$referenceId = $parameters['id'];
+		$type = $this->parameters['type'];
+		$referenceId = $this->parameters['id'];
 
 		$expectedTypes = ['item', 'photo', 'event'];
 		if (!in_array($type, $expectedTypes)) {
@@ -32,6 +32,10 @@ class PermissionTooltip extends \Friendica\BaseModule
 		} else {
 			$fields = ['uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
 			$model = DBA::selectFirst($type, $fields, $condition);
+			$model['allow_cid'] = DI::aclFormatter()->expand($model['allow_cid']);
+			$model['allow_gid'] = DI::aclFormatter()->expand($model['allow_gid']);
+			$model['deny_cid']  = DI::aclFormatter()->expand($model['deny_cid']);
+			$model['deny_gid']  = DI::aclFormatter()->expand($model['deny_gid']);
 		}
 
 		if (!DBA::isResult($model)) {
@@ -39,7 +43,7 @@ class PermissionTooltip extends \Friendica\BaseModule
 		}
 
 		if (isset($model['psid'])) {
-			$permissionSet = DI::permissionSet()->selectFirst(['id' => $model['psid']]);
+			$permissionSet = DI::permissionSet()->selectOneById($model['psid'], $model['uid']);
 			$model['allow_cid'] = $permissionSet->allow_cid;
 			$model['allow_gid'] = $permissionSet->allow_gid;
 			$model['deny_cid']  = $permissionSet->deny_cid;
@@ -61,12 +65,10 @@ class PermissionTooltip extends \Friendica\BaseModule
 			exit;
 		}
 
-		$aclFormatter = DI::aclFormatter();
-
-		$allowed_users  = $aclFormatter->expand($model['allow_cid']);
-		$allowed_groups = $aclFormatter->expand($model['allow_gid']);
-		$deny_users     = $aclFormatter->expand($model['deny_cid']);
-		$deny_groups    = $aclFormatter->expand($model['deny_gid']);
+		$allowed_users  = $model['allow_cid'];
+		$allowed_groups = $model['allow_gid'];
+		$deny_users     = $model['deny_cid'];
+		$deny_groups    = $model['deny_gid'];
 
 		$o = DI::l10n()->t('Visible to:') . '<br />';
 		$l = [];