Use rawContent for Special Options to avoid a protected options() method

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

diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index abcc5679ee20893268306f1ad4f98fcbc3a20d39..c14573c8b330c9a76e55384ac6e31d6e44938aa1 100644 (file)
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,7 +27,6 @@ use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Contact;
 use Friendica\Model\Notification;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException\ForbiddenException;
@@ -38,14 +37,14 @@ use Friendica\Util\Proxy;
  */
 class Delegation extends BaseModule
 {
-       public static function post(array $parameters = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;
                }
 
                $uid = local_user();
-               $orig_record = DI::app()->user;
+               $orig_record = User::getById(DI::app()->getLoggedInUserId());
 
                if (Session::get('submanage')) {
                        $user = User::getById(Session::get('submanage'));
@@ -109,11 +108,12 @@ class Delegation extends BaseModule
                $ret = [];
                Hook::callAll('home_init', $ret);
 
-               DI::baseUrl()->redirect('profile/' . DI::app()->user['nickname']);
-               // NOTREACHED
+               notice($this->t('You are now logged in as %s', $user['username']));
+
+               DI::baseUrl()->redirect('network');
        }
 
-       public static function content(array $parameters = [])
+       protected function content(array $request = []): string
        {
                if (!local_user()) {
                        throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -123,23 +123,18 @@ class Delegation extends BaseModule
 
                //getting additinal information for each identity
                foreach ($identities as $key => $identity) {
-                       $self = Contact::selectFirst(['id', 'updated'], ['uid' => $identity['uid'], 'self' => true]);
-                       if (!DBA::isResult($self)) {
-                               continue;
-                       }
-
-                       $identities[$key]['thumb'] = Contact::getAvatarUrlForId($self['id'], Proxy::SIZE_THUMB, $self['updated']);
+                       $identities[$key]['thumb'] = User::getAvatarUrl($identity, Proxy::SIZE_THUMB);
 
-                       $identities[$key]['selected'] = ($identity['nickname'] === DI::app()->user['nickname']);
+                       $identities[$key]['selected'] = ($identity['nickname'] === DI::app()->getLoggedInUserNickname());
 
-                       $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Notification\Type::INTRO, Notification\Type::MAIL];
+                       $condition = ["`msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", Notification\Type::INTRO, Notification\Type::MAIL];
                        $params = ['distinct' => true, 'expression' => 'parent'];
-                       $notifications = DBA::count('notify', $condition, $params);
+                       $notifications = DI::notify()->countForUser($identity['uid'], $condition, $params);
 
                        $params = ['distinct' => true, 'expression' => 'convid'];
                        $notifications += DBA::count('mail', ['uid' => $identity['uid'], 'seen' => false], $params);
 
-                       $notifications += DBA::count('intro', ['blocked' => false, 'ignore' => false, 'uid' => $identity['uid']]);
+                       $notifications += DI::intro()->countActiveForUser($identity['uid']);
 
                        $identities[$key]['notifications'] = $notifications;
                }