Random profiles now moved away from "gcontact" as well

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

diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index a255ad38417b0ea3fadc4cacc76634d8434ff537..b6451c85af2d2822bec11cc3288fe636f9b94e0b 100644 (file)
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -1,16 +1,34 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 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;