X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDelegation.php;h=b6451c85af2d2822bec11cc3288fe636f9b94e0b;hb=bb1517a74c6252a89812929e98910d9e293664a9;hp=a255ad38417b0ea3fadc4cacc76634d8434ff537;hpb=1de3f186d79f3703850524c1d58c237be3eb25f3;p=friendica.git diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php index a255ad3841..b6451c85af 100644 --- a/src/Module/Delegation.php +++ b/src/Module/Delegation.php @@ -1,16 +1,34 @@ . + * + */ namespace Friendica\Module; use Friendica\BaseModule; -use Friendica\App\Authentication; 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\Notify\Type; use Friendica\Model\User; use Friendica\Network\HTTPException\ForbiddenException; @@ -81,9 +99,7 @@ class Delegation extends BaseModule Session::clear(); - /** @var Authentication $authentication */ - $authentication = self::getClass(Authentication::class); - $authentication->setForUser(DI::app(), $user, true, true); + DI::auth()->setForUser(DI::app(), $user, true, true); if ($limited_id) { Session::set('submanage', $original_id); @@ -92,14 +108,14 @@ class Delegation extends BaseModule $ret = []; Hook::callAll('home_init', $ret); - DI::app()->internalRedirect('profile/' . DI::app()->user['nickname']); + DI::baseUrl()->redirect('profile/' . DI::app()->user['nickname']); // NOTREACHED } 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 = DI::app()->identities; @@ -115,7 +131,7 @@ class Delegation extends BaseModule $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]; + $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Type::INTRO, Type::MAIL]; $params = ['distinct' => true, 'expression' => 'parent']; $notifications = DBA::count('notify', $condition, $params); @@ -128,11 +144,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;