Merge pull request #8647 from annando/annando/issue8619

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 9b4b440bbc9a1ea6e2c2ad1fb1dcd894b4243e7e..56cb13a06b97bc24adaf9005ad27b9f50086592c 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,7 +1,25 @@
 <?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/>.
+ *
+ */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use Friendica\Core\System;
@@ -30,7 +48,7 @@ function redir_init(App $a) {
                $fields = ['id', 'uid', 'nurl', 'url', 'addr', 'name', 'network', 'poll', 'issued-id', 'dfrn-id', 'duplex', 'pending'];
                $contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, local_user()]]);
                if (!DBA::isResult($contact)) {
-                       notice(L10n::t('Contact not found.'));
+                       notice(DI::l10n()->t('Contact not found.'));
                        DI::baseUrl()->redirect();
                }
 
@@ -120,7 +138,7 @@ function redir_init(App $a) {
                $a->redirect($url);
        }
 
-       notice(L10n::t('Contact not found.'));
+       notice(DI::l10n()->t('Contact not found.'));
        DI::baseUrl()->redirect();
 }
 
@@ -135,7 +153,7 @@ function redir_magic($a, $cid, $url)
        if (!DBA::isResult($contact)) {
                Logger::info('Contact not found', ['id' => $cid]);
                // Shouldn't happen under normal conditions
-               notice(L10n::t('Contact not found.'));
+               notice(DI::l10n()->t('Contact not found.'));
                if (!empty($url)) {
                        System::externalRedirect($url);
                } else {
@@ -149,9 +167,9 @@ function redir_magic($a, $cid, $url)
        $basepath = Contact::getBasepath($contact_url);
 
        // We don't use magic auth when there is no visitor, we are on the same system or we visit our own stuff
-       if (empty($visitor) || Strings::compareLink($basepath, System::baseUrl()) || Strings::compareLink($contact_url, $visitor)) {
+       if (empty($visitor) || Strings::compareLink($basepath, DI::baseUrl()) || Strings::compareLink($contact_url, $visitor)) {
                Logger::info('Redirecting without magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
-               System::externalRedirect($target_url);
+               DI::app()->redirect($target_url);
        }
 
        // Test for magic auth on the target system