Merge pull request #8191 from MrPetovan/task/7967-mastodon-api-custom_emojis

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 12d93186e29d65e9a02052fa599ef9661cd59961..1d36065e9956ae844842e96d48bf07e2087e46b4 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,11 +1,11 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\Network;
@@ -13,7 +13,7 @@ use Friendica\Util\Strings;
 
 function redir_init(App $a) {
 
-       $url = defaults($_GET, 'url', '');
+       $url = $_GET['url'] ?? '';
        $quiet = !empty($_GET['quiet']) ? '&quiet=1' : '';
 
        if ($a->argc > 1 && intval($a->argv[1])) {
@@ -29,8 +29,8 @@ 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.'));
-                       $a->internalRedirect();
+                       notice(DI::l10n()->t('Contact not found.'));
+                       DI::baseUrl()->redirect();
                }
 
                $contact_url = $contact['url'];
@@ -38,7 +38,7 @@ function redir_init(App $a) {
                if (!Session::isAuthenticated() // Visitors (not logged in or not remotes) can't authenticate.
                        || (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
                {
-                       $a->redirect(defaults($url, $contact_url));
+                       $a->redirect($url ?: $contact_url);
                }
 
                if ($contact['uid'] == 0 && local_user()) {
@@ -52,14 +52,14 @@ function redir_init(App $a) {
 
                        if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
                                // Local user is already authenticated.
-                               $target_url = defaults($url, $contact_url);
+                               $target_url = $url ?: $contact_url;
                                Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
                                $a->redirect($target_url);
                        }
                }
 
                if (remote_user()) {
-                       $host = substr($a->getBaseURL() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''), strpos($a->getBaseURL(), '://') + 3);
+                       $host = substr(DI::baseUrl()->getUrlPath() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : ''), strpos(DI::baseUrl()->getUrlPath(), '://') + 3);
                        $remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1);
 
                        // On a local instance we have to check if the local user has already authenticated
@@ -68,7 +68,7 @@ function redir_init(App $a) {
                        // contact.
                        if (($host == $remotehost) && (Session::getRemoteContactID(Session::get('visitor_visiting')) == Session::get('visitor_id'))) {
                                // Remote user is already authenticated.
-                               $target_url = defaults($url, $contact_url);
+                               $target_url = $url ?: $contact_url;
                                Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
                                $a->redirect($target_url);
                        }
@@ -101,7 +101,7 @@ function redir_init(App $a) {
                                . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
                }
 
-               $url = defaults($url, $contact_url);
+               $url = $url ?: $contact_url;
        }
 
        // If we don't have a connected contact, redirect with
@@ -119,8 +119,8 @@ function redir_init(App $a) {
                $a->redirect($url);
        }
 
-       notice(L10n::t('Contact not found.'));
-       $a->internalRedirect();
+       notice(DI::l10n()->t('Contact not found.'));
+       DI::baseUrl()->redirect();
 }
 
 function redir_magic($a, $cid, $url)
@@ -134,23 +134,23 @@ 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)) {
-                       $a->redirect($url);
+                       System::externalRedirect($url);
                } else {
-                       $a->internalRedirect();
+                       DI::baseUrl()->redirect();
                }
        } else {
                $contact_url = $contact['url'];
-               $target_url = defaults($url, $contact_url);
+               $target_url = $url ?: $contact_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]);
-               $a->redirect($target_url);
+               DI::app()->redirect($target_url);
        }
 
        // Test for magic auth on the target system
@@ -160,7 +160,7 @@ function redir_magic($a, $cid, $url)
                $target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);
 
                Logger::info('Redirecting with magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
-               $a->redirect($target_url);
+               System::externalRedirect($target_url);
        } else {
                Logger::info('No magic for contact', ['contact' => $contact_url]);
        }