Remove join profile table

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

diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index 46dc7025ee9fd8600cdc0b033dcf0a6774c50ac0..8f52ec38ce7e26be09de2ce0c278600aa051e24f 100644 (file)
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -4,10 +4,10 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException\ForbiddenException;
@@ -17,14 +17,14 @@ use Friendica\Network\HTTPException\ForbiddenException;
  */
 class Delegation extends BaseModule
 {
-       public static function post($parameters)
+       public static function post(array $parameters = [])
        {
                if (!local_user()) {
                        return;
                }
 
                $uid = local_user();
-               $orig_record = self::getApp()->user;
+               $orig_record = DI::app()->user;
 
                if (Session::get('submanage')) {
                        $user = User::getById(Session::get('submanage'));
@@ -79,7 +79,7 @@ class Delegation extends BaseModule
 
                Session::clear();
 
-               Session::setAuthenticatedForUser(self::getApp(), $user, true, true);
+               DI::auth()->setForUser(DI::app(), $user, true, true);
 
                if ($limited_id) {
                        Session::set('submanage', $original_id);
@@ -88,17 +88,17 @@ class Delegation extends BaseModule
                $ret = [];
                Hook::callAll('home_init', $ret);
 
-               self::getApp()->internalRedirect('profile/' . self::getApp()->user['nickname']);
+               DI::baseUrl()->redirect('profile/' . DI::app()->user['nickname']);
                // NOTREACHED
        }
 
-       public static function content($parameters)
+       public static function content(array $parameters = [])
        {
                if (!local_user()) {
-                       throw new ForbiddenException(L10n::t('Permission denied.'));
+                       throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
                }
 
-               $identities = self::getApp()->identities;
+               $identities = DI::app()->identities;
 
                //getting additinal information for each identity
                foreach ($identities as $key => $identity) {
@@ -109,7 +109,7 @@ class Delegation extends BaseModule
 
                        $identities[$key]['thumb'] = $thumb['thumb'];
 
-                       $identities[$key]['selected'] = ($identity['nickname'] === self::getApp()->user['nickname']);
+                       $identities[$key]['selected'] = ($identity['nickname'] === DI::app()->user['nickname']);
 
                        $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], NOTIFY_INTRO, NOTIFY_MAIL];
                        $params = ['distinct' => true, 'expression' => 'parent'];
@@ -124,11 +124,11 @@ class Delegation extends BaseModule
                }
 
                $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('delegation.tpl'), [
-                       '$title'      => L10n::t('Manage Identities and/or Pages'),
-                       '$desc'       => L10n::t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'),
-                       '$choose'     => L10n::t('Select an identity to manage: '),
+                       '$title'      => DI::l10n()->t('Manage Identities and/or Pages'),
+                       '$desc'       => DI::l10n()->t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'),
+                       '$choose'     => DI::l10n()->t('Select an identity to manage: '),
                        '$identities' => $identities,
-                       '$submit'     => L10n::t('Submit'),
+                       '$submit'     => DI::l10n()->t('Submit'),
                ]);
 
                return $o;