X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDelegation.php;h=bc3c72e8d008c8b9d248fe9ed4868219930a5dcb;hb=39c2282c1292af173f854e2a4338c601f9ba58f6;hp=70991c0d0faaf3d704af3ee28c4b2efe46712c4b;hpb=53e38b03130ea798bba44db44ccb7f331dc4b91d;p=friendica.git

diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index 70991c0d0f..bc3c72e8d0 100644
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -27,24 +27,24 @@ 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;
+use Friendica\Util\Proxy;
 
 /**
  * Switches current user between delegates/parent user
  */
 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'));
@@ -108,37 +108,32 @@ class Delegation extends BaseModule
 		$ret = [];
 		Hook::callAll('home_init', $ret);
 
-		DI::baseUrl()->redirect('profile/' . DI::app()->user['nickname']);
+		DI::baseUrl()->redirect('profile/' . DI::app()->getLoggedInUserNickname());
 		// NOTREACHED
 	}
 
-	public static function content(array $parameters = [])
+	protected function content(array $request = []): string
 	{
 		if (!local_user()) {
 			throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
 		}
 
-		$identities = DI::app()->identities;
+		$identities = User::identities(DI::session()->get('submanage', local_user()));
 
 		//getting additinal information for each identity
 		foreach ($identities as $key => $identity) {
-			$thumb = Contact::selectFirst(['thumb'], ['uid' => $identity['uid'], 'self' => true]);
-			if (!DBA::isResult($thumb)) {
-				continue;
-			}
-
-			$identities[$key]['thumb'] = $thumb['thumb'];
+			$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;
 		}