X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPermissionTooltip.php;h=71ce2beee2aca1a11a4402e3130266bf102c56fe;hb=c55c42b303846c63841ce982ef485fac9904d0da;hp=59478b326ccf069a1f806c6296707062330b7412;hpb=d7b567447616c560e2bb1e1d4fad9193042b1dd2;p=friendica.git

diff --git a/src/Module/PermissionTooltip.php b/src/Module/PermissionTooltip.php
index 59478b326c..71ce2beee2 100644
--- a/src/Module/PermissionTooltip.php
+++ b/src/Module/PermissionTooltip.php
@@ -1,12 +1,32 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @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/>.
+ *
+ */
 
 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;
 
 /**
@@ -14,12 +34,10 @@ use Friendica\Network\HTTPException;
  */
 class PermissionTooltip extends \Friendica\BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	protected function rawContent(array $request = [])
 	{
-		parent::rawContent($parameters); // TODO: Change the autogenerated stub
-
-		$type = $parameters['type'];
-		$referenceId = $parameters['id'];
+		$type = $this->parameters['type'];
+		$referenceId = $this->parameters['id'];
 
 		$expectedTypes = ['item', 'photo', 'event'];
 		if (!in_array($type, $expectedTypes)) {
@@ -29,10 +47,14 @@ class PermissionTooltip extends \Friendica\BaseModule
 		$condition = ['id' => $referenceId];
 		if ($type == 'item') {
 			$fields = ['uid', 'psid', 'private'];
-			$model = Item::selectFirst($fields, $condition);
+			$model = Post::selectFirst($fields, $condition);
 		} 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)) {
@@ -40,7 +62,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;
@@ -62,12 +84,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 = [];