Standards

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

diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index 4ec6a977b27bfa7a0354721f888edbc5d1ae09e6..691d9d955dde8b4b6336868753d6263d18cb5c96 100644 (file)
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -35,23 +35,23 @@ use Friendica\Util\DateTimeFormat;
 
 class Profile extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
                $a = DI::app();
 
                // Ensure we've got a profile owner if updating.
-               $a->profile_owner = intval($_GET['p'] ?? 0);
+               $a->setProfileOwner($_GET['p'] ?? 0);
 
-               if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->profile_owner)) {
+               if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->getProfileOwner())) {
                        throw new ForbiddenException();
                }
 
-               $remote_contact = Session::getRemoteContactID($a->profile_owner);
-               $is_owner = local_user() == $a->profile_owner;
-               $last_updated_key = "profile:" . $a->profile_owner . ":" . 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 (!$is_owner && !$remote_contact) {
-                       $user = User::getById($a->profile_owner, ['hidewall']);
+                       $user = User::getById($a->getProfileOwner(), ['hidewall']);
                        if ($user['hidewall']) {
                                throw new ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.'));
                        }
@@ -64,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_owner);
+               $sql_extra = Item::getPermissionsSQLByUserId($a->getProfileOwner());
 
                $last_updated_array = Session::get('last_updated', []);
 
@@ -88,12 +88,12 @@ class Profile extends BaseModule
                                AND `visible` AND (NOT `deleted` OR `gravity` = ?)
                                AND `wall` $sql_extra4 $sql_extra
                        GROUP BY `parent-uri-id` ORDER BY `received` DESC",
-                       $a->profile_owner,
+                       $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
@@ -101,7 +101,7 @@ class Profile extends BaseModule
                $last_updated_array[$last_updated_key] = time();
                Session::set('last_updated', $last_updated_array);
 
-               if ($is_owner && !$a->profile_owner && !DI::config()->get('theme', 'hide_eventlist')) {
+               if ($is_owner && !$a->getProfileOwner() && !DI::config()->get('theme', 'hide_eventlist')) {
                        $o .= ProfileModel::getBirthdays();
                        $o .= ProfileModel::getEventsReminderHTML();
                }
@@ -115,7 +115,7 @@ class Profile extends BaseModule
 
                $items = DBA::toArray($items_stmt);
 
-               $o .= conversation($a, $items, 'profile', $a->profile_owner, false, 'received', $a->profile_owner);
+               $o .= DI::conversation()->create($items, 'profile', $a->getProfileOwner(), false, 'received', $a->getProfileOwner());
 
                System::htmlUpdateExit($o);
        }