Create Profile\Photos\Upload class

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

diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index fa3f36e88564695419a33fbee1712d2e8b4818e4..951a0e32702d4df6ca8852c1643ec6ee734a00fe 100644 (file)
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -26,7 +26,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\ACL;
 use Friendica\Core\Protocol;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -92,19 +91,19 @@ class Status extends BaseProfile
 
                $hashtags = $_GET['tag'] ?? '';
 
-               if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($profile['uid'])) {
+               if (DI::config()->get('system', 'block_public') && !DI::userSession()->getLocalUserId() && !DI::userSession()->getRemoteContactID($profile['uid'])) {
                        return Login::form();
                }
 
                $o = '';
 
-               if ($profile['uid'] == local_user()) {
+               if ($profile['uid'] == DI::userSession()->getLocalUserId()) {
                        Nav::setSelected('home');
                }
 
-               $remote_contact = Session::getRemoteContactID($profile['uid']);
-               $is_owner = local_user() == $profile['uid'];
-               $last_updated_key = "profile:" . $profile['uid'] . ":" . local_user() . ":" . $remote_contact;
+               $remote_contact = DI::userSession()->getRemoteContactID($profile['uid']);
+               $is_owner = DI::userSession()->getLocalUserId() == $profile['uid'];
+               $last_updated_key = "profile:" . $profile['uid'] . ":" . DI::userSession()->getLocalUserId() . ":" . $remote_contact;
 
                if (!empty($profile['hidewall']) && !$is_owner && !$remote_contact) {
                        DI::sysmsg()->addNotice(DI::l10n()->t('Access to this profile has been restricted.'));
@@ -166,10 +165,10 @@ class Status extends BaseProfile
                }
 
                if (DI::mode()->isMobile()) {
-                       $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+                       $itemspage_network = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_mobile_network',
                                DI::config()->get('system', 'itemspage_network_mobile'));
                } else {
-                       $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+                       $itemspage_network = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_network',
                                DI::config()->get('system', 'itemspage_network'));
                }
 
@@ -197,9 +196,9 @@ class Status extends BaseProfile
                }
 
                if ($is_owner) {
-                       $unseen = Post::exists(['wall' => true, 'unseen' => true, 'uid' => local_user()]);
+                       $unseen = Post::exists(['wall' => true, 'unseen' => true, 'uid' => DI::userSession()->getLocalUserId()]);
                        if ($unseen) {
-                               Item::update(['unseen' => false], ['wall' => true, 'unseen' => true, 'uid' => local_user()]);
+                               Item::update(['unseen' => false], ['wall' => true, 'unseen' => true, 'uid' => DI::userSession()->getLocalUserId()]);
                        }
                }