Standards

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

diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index 8c20f400f49e45390b61f37d05789720b95c5c4b..691d9d955dde8b4b6336868753d6263d18cb5c96 100644 (file)
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,30 +29,32 @@ use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Profile as ProfileModel;
+use Friendica\Model\User;
 use Friendica\Network\HTTPException\ForbiddenException;
 use Friendica\Util\DateTimeFormat;
 
 class Profile extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
                $a = DI::app();
 
-               if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->profile['uid'])) {
+               // Ensure we've got a profile owner if updating.
+               $a->setProfileOwner($_GET['p'] ?? 0);
+
+               if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->getProfileOwner())) {
                        throw new ForbiddenException();
                }
 
-               $profile_uid = intval($_GET['p'] ?? 0);
-
-               // Ensure we've got a profile owner if updating.
-               $a->profile['uid'] = $profile_uid;
-
-               $remote_contact = Session::getRemoteContactID($a->profile['uid']);
-               $is_owner = local_user() == $a->profile['uid'];
-               $last_updated_key = "profile:" . $a->profile['uid'] . ":" . local_user() . ":" . $remote_contact;
+               $remote_contact = Session::getRemoteContactID($a->getProfileOwner());
+               $is_owner = local_user() == $a->getProfileOwner();
+               $last_updated_key = "profile:" . $a->getProfileOwner() . ":" . local_user() . ":" . $remote_contact;
 
-               if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact) {
-                       throw new ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.'));
+               if (!$is_owner && !$remote_contact) {
+                       $user = User::getById($a->getProfileOwner(), ['hidewall']);
+                       if ($user['hidewall']) {
+                               throw new ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.'));
+                       }
                }
 
                $o = '';
@@ -62,7 +64,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['uid']);
+               $sql_extra = Item::getPermissionsSQLByUserId($a->getProfileOwner());
 
                $last_updated_array = Session::get('last_updated', []);
 
@@ -81,17 +83,17 @@ class Profile extends BaseModule
                }
 
                $items_stmt = DBA::p(
-                       "SELECT DISTINCT(`parent-uri-id`) AS `uri-id`, MAX(`created`), MAX(`received`) FROM `post-user-view`
+                       "SELECT `parent-uri-id` AS `uri-id`, MAX(`created`), MAX(`received`) FROM `post-user-view`
                                WHERE `uid` = ? AND NOT `contact-blocked` AND NOT `contact-pending`
                                AND `visible` AND (NOT `deleted` OR `gravity` = ?)
                                AND `wall` $sql_extra4 $sql_extra
-                       ORDER BY `received` DESC",
-                       $a->profile['uid'],
+                       GROUP BY `parent-uri-id` ORDER BY `received` DESC",
+                       $a->getProfileOwner(),
                        GRAVITY_ACTIVITY
                );
 
                if (!DBA::isResult($items_stmt)) {
-                       return '';
+                       return;
                }
 
                // Set a time stamp for this page. We will make use of it when we
@@ -99,7 +101,7 @@ class Profile extends BaseModule
                $last_updated_array[$last_updated_key] = time();
                Session::set('last_updated', $last_updated_array);
 
-               if ($is_owner && !$profile_uid && !DI::config()->get('theme', 'hide_eventlist')) {
+               if ($is_owner && !$a->getProfileOwner() && !DI::config()->get('theme', 'hide_eventlist')) {
                        $o .= ProfileModel::getBirthdays();
                        $o .= ProfileModel::getEventsReminderHTML();
                }
@@ -113,7 +115,7 @@ class Profile extends BaseModule
 
                $items = DBA::toArray($items_stmt);
 
-               $o .= conversation($a, $items, 'profile', $profile_uid, false, 'received', $a->profile['uid']);
+               $o .= DI::conversation()->create($items, 'profile', $a->getProfileOwner(), false, 'received', $a->getProfileOwner());
 
                System::htmlUpdateExit($o);
        }