Merge pull request #8006 from MrPetovan/bug/7991-remove-group-add-restrictions

[friendica.git] / src / Module / Profile.php

diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 98c504425b9942820d7dbc8c202b9a1638fc47c1..db1a6f86b3db44e4674aeb8394772f12d6373df0 100644 (file)
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -33,7 +33,7 @@ class Profile extends BaseModule
        public static $which = '';
        public static $profile = 0;
 
-       public static function init()
+       public static function init(array $parameters = [])
        {
                $a = self::getApp();
 
@@ -48,12 +48,10 @@ class Profile extends BaseModule
                if (local_user() && $a->argc > 2 && $a->argv[2] === 'view') {
                        self::$which = $a->user['nickname'];
                        self::$profile = filter_var($a->argv[1], FILTER_SANITIZE_NUMBER_INT);
-               } else {
-                       DFRN::autoRedir($a, self::$which);
                }
        }
 
-       public static function rawContent()
+       public static function rawContent(array $parameters = [])
        {
                if (ActivityPub::isRequest()) {
                        $user = DBA::selectFirst('user', ['uid'], ['nickname' => self::$which]);
@@ -77,7 +75,7 @@ class Profile extends BaseModule
                }
        }
 
-       public static function content($update = 0)
+       public static function content(array $parameters = [], $update = 0)
        {
                $a = self::getApp();
 
@@ -86,8 +84,8 @@ class Profile extends BaseModule
 
                        $a->page['htmlhead'] .= "\n";
 
-                       $blocked   = !local_user() && !remote_user($a->profile['profile_uid']) && Config::get('system', 'block_public');
-                       $userblock = !local_user() && !remote_user($a->profile['profile_uid']) && $a->profile['hidewall'];
+                       $blocked   = !local_user() && !Session::getRemoteContactID($a->profile['profile_uid']) && Config::get('system', 'block_public');
+                       $userblock = !local_user() && !Session::getRemoteContactID($a->profile['profile_uid']) && $a->profile['hidewall'];
 
                        if (!empty($a->profile['page-flags']) && $a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY) {
                                $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />' . "\n";
@@ -104,7 +102,7 @@ class Profile extends BaseModule
 
                        // site block
                        if (!$blocked && !$userblock) {
-                               $keywords = str_replace(['#', ',', ' ', ',,'], ['', ' ', ',', ','], defaults($a->profile, 'pub_keywords', ''));
+                               $keywords = str_replace(['#', ',', ' ', ',,'], ['', ' ', ',', ','], $a->profile['pub_keywords'] ?? '');
                                if (strlen($keywords)) {
                                        $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\n";
                                }
@@ -133,9 +131,12 @@ class Profile extends BaseModule
 
                $category = $datequery = $datequery2 = '';
 
+               /** @var DateTimeFormat $dtFormat */
+               $dtFormat = self::getClass(DateTimeFormat::class);
+
                if ($a->argc > 2) {
                        for ($x = 2; $x < $a->argc; $x ++) {
-                               if (is_a_date_arg($a->argv[$x])) {
+                               if ($dtFormat->isYearMonth($a->argv[$x])) {
                                        if ($datequery) {
                                                $datequery2 = Strings::escapeHtml($a->argv[$x]);
                                        } else {
@@ -148,18 +149,15 @@ class Profile extends BaseModule
                }
 
                if (empty($category)) {
-                       $category = defaults($_GET, 'category', '');
+                       $category = $_GET['category'] ?? '';
                }
 
-               $hashtags = defaults($_GET, 'tag', '');
+               $hashtags = $_GET['tag'] ?? '';
 
-               if (Config::get('system', 'block_public') && !local_user() && !remote_user($a->profile['profile_uid'])) {
+               if (Config::get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->profile['profile_uid'])) {
                        return Login::form();
                }
 
-               $groups = [];
-               $remote_cid = null;
-
                $o = '';
 
                if ($update) {
@@ -169,25 +167,17 @@ class Profile extends BaseModule
                        Nav::setSelected('home');
                }
 
-               $remote_contact = remote_user($a->profile['profile_uid']);
+               $remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
                $is_owner = local_user() == $a->profile['profile_uid'];
                $last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . $remote_contact;
 
-               if ($remote_contact) {
-                       $cdata = ContactModel::getPublicAndUserContacID($remote_contact, $a->profile['profile_uid']);
-                       if (!empty($cdata['user'])) {
-                               $groups = Group::getIdsByContactId($cdata['user']);
-                               $remote_cid = $cdata['user'];
-                       }
-               }
-
                if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact) {
                        notice(L10n::t('Access to this profile has been restricted.') . EOL);
                        return '';
                }
 
                if (!$update) {
-            $tab = Strings::escapeTags(trim(defaults($_GET, 'tab', '')));
+                       $tab = Strings::escapeTags(trim($_GET['tab'] ?? ''));
 
                        $o .= ProfileModel::getTabs($a, $tab, $is_owner, $a->profile['nickname']);
 
@@ -218,7 +208,7 @@ class Profile extends BaseModule
                                                || strlen($a->user['deny_cid'])
                                                || strlen($a->user['deny_gid'])
                                        ) ? 'lock' : 'unlock',
-                                       'acl' => $is_owner ? ACL::getFullSelectorHTML($a->user, true) : '',
+                                       'acl' => $is_owner ? ACL::getFullSelectorHTML($a->page, $a->user, true) : '',
                                        'bang' => '',
                                        'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
                                        'profile_uid' => $a->profile['profile_uid'],
@@ -229,7 +219,7 @@ class Profile extends BaseModule
                }
 
                // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
-               $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid'], $remote_contact, $groups, $remote_cid);
+               $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid']);
                $sql_extra2 = '';
 
                $last_updated_array = Session::get('last_updated', []);
@@ -359,7 +349,13 @@ class Profile extends BaseModule
 
                $items = DBA::toArray($items_stmt);
 
-               $o .= conversation($a, $items, $pager, 'profile', $update, false, 'received', $a->profile['profile_uid']);
+               if ($pager->getStart() == 0 && !empty($a->profile['profile_uid'])) {
+                       $pinned_items = Item::selectPinned($a->profile['profile_uid'], ['uri', 'pinned'], ['true' . $sql_extra]);
+                       $pinned = Item::inArray($pinned_items);
+                       $items = array_merge($items, $pinned);
+               }
+
+               $o .= conversation($a, $items, $pager, 'profile', $update, false, 'pinned_received', $a->profile['profile_uid']);
 
                if (!$update) {
                        $o .= $pager->renderMinimal(count($items));