Merge remote-tracking branch 'upstream/develop' into audience

[friendica.git] / src / Module / Settings / Delegation.php

diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php
index 19e62b6f0ddd421f1dafc9e3203f4a3597a99ce1..134b002c1bc79c85df3820b26d1f9d2f45b07f06 100644 (file)
--- a/src/Module/Settings/Delegation.php
+++ b/src/Module/Settings/Delegation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,7 +23,6 @@ namespace Friendica\Module\Settings;
 
 use Friendica\BaseModule;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -59,14 +58,14 @@ class Delegation extends BaseSettings
                        DI::sysmsg()->addInfo(DI::l10n()->t('Delegation successfully revoked.'));
                }
 
-               DBA::update('user', ['parent-uid' => $parent_uid], ['uid' => Session::getLocalUser()]);
+               DBA::update('user', ['parent-uid' => $parent_uid], ['uid' => DI::userSession()->getLocalUserId()]);
        }
 
        protected function content(array $request = []): string
        {
                parent::content();
 
-               if (!Session::getLocalUser()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
                }
 
@@ -77,7 +76,7 @@ class Delegation extends BaseSettings
                $user_id = $args->get(3);
 
                if ($action === 'add' && $user_id) {
-                       if (DI::session()->get('submanage')) {
+                       if (DI::userSession()->getSubManagedUserId()) {
                                DI::sysmsg()->addNotice(DI::l10n()->t('Delegated administrators can view but not change delegation permissions.'));
                                DI::baseUrl()->redirect('settings/delegation');
                        }
@@ -85,11 +84,11 @@ class Delegation extends BaseSettings
                        $user = User::getById($user_id, ['nickname']);
                        if (DBA::isResult($user)) {
                                $condition = [
-                                       'uid' => Session::getLocalUser(),
+                                       'uid' => DI::userSession()->getLocalUserId(),
                                        'nurl' => Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname'])
                                ];
                                if (DBA::exists('contact', $condition)) {
-                                       DBA::insert('manage', ['uid' => $user_id, 'mid' => Session::getLocalUser()]);
+                                       DBA::insert('manage', ['uid' => $user_id, 'mid' => DI::userSession()->getLocalUserId()]);
                                }
                        } else {
                                DI::sysmsg()->addNotice(DI::l10n()->t('Delegate user not found.'));
@@ -99,17 +98,17 @@ class Delegation extends BaseSettings
                }
 
                if ($action === 'remove' && $user_id) {
-                       if (DI::session()->get('submanage')) {
+                       if (DI::userSession()->getSubManagedUserId()) {
                                DI::sysmsg()->addNotice(DI::l10n()->t('Delegated administrators can view but not change delegation permissions.'));
                                DI::baseUrl()->redirect('settings/delegation');
                        }
 
-                       DBA::delete('manage', ['uid' => $user_id, 'mid' => Session::getLocalUser()]);
+                       DBA::delete('manage', ['uid' => $user_id, 'mid' => DI::userSession()->getLocalUserId()]);
                        DI::baseUrl()->redirect('settings/delegation');
                }
 
                // find everybody that currently has delegated management to this account/page
-               $delegates = DBA::selectToArray('user', [], ['`uid` IN (SELECT `uid` FROM `manage` WHERE `mid` = ?)', Session::getLocalUser()]);
+               $delegates = DBA::selectToArray('user', [], ['`uid` IN (SELECT `uid` FROM `manage` WHERE `mid` = ?)', DI::userSession()->getLocalUserId()]);
 
                $uids = [];
                foreach ($delegates as $user) {
@@ -120,7 +119,7 @@ class Delegation extends BaseSettings
                $potentials = [];
                $nicknames = [];
 
-               $condition = ['baseurl' => DI::baseUrl(), 'self' => false, 'uid' => Session::getLocalUser(), 'blocked' => false];
+               $condition = ['baseurl' => DI::baseUrl(), 'self' => false, 'uid' => DI::userSession()->getLocalUserId(), 'blocked' => false];
                $contacts = DBA::select('contact', ['nick'], $condition);
                while ($contact = DBA::fetch($contacts)) {
                        $nicknames[] = $contact['nick'];
@@ -137,8 +136,8 @@ class Delegation extends BaseSettings
 
                $parent_user = null;
                $parent_password = null;
-               $user = User::getById(Session::getLocalUser(), ['parent-uid', 'email']);
-               if (DBA::isResult($user) && !DBA::exists('user', ['parent-uid' => Session::getLocalUser()])) {
+               $user = User::getById(DI::userSession()->getLocalUserId(), ['parent-uid', 'email']);
+               if (DBA::isResult($user) && !DBA::exists('user', ['parent-uid' => DI::userSession()->getLocalUserId()])) {
                        $parent_uid = $user['parent-uid'];
                        $parents = [0 => DI::l10n()->t('No parent user')];
 
@@ -146,7 +145,7 @@ class Delegation extends BaseSettings
                        $condition = ['email' => $user['email'], 'verified' => true, 'blocked' => false, 'parent-uid' => 0];
                        $parent_users = DBA::selectToArray('user', $fields, $condition);
                        foreach($parent_users as $parent) {
-                               if ($parent['uid'] != Session::getLocalUser()) {
+                               if ($parent['uid'] != DI::userSession()->getLocalUserId()) {
                                        $parents[$parent['uid']] = sprintf('%s (%s)', $parent['username'], $parent['nickname']);
                                }
                        }