Replace legacy file/category handling

[friendica.git/.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 4eb662e..b2f7673 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -27,7 +27,6 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 function redir_init(App $a) {
@@ -171,7 +170,7 @@ function redir_magic($a, $cid, $url)
        }
 
        // Test for magic auth on the target system
-       $serverret = Network::curl($basepath . '/magic');
+       $serverret = DI::httpRequest()->get($basepath . '/magic');
        if ($serverret->isSuccess()) {
                $separator = strpos($target_url, '?') ? '&' : '?';
                $target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);
@@ -190,6 +189,10 @@ function redir_check_url(string $contact_url, string $url)
        }
 
        $url_host = parse_url($url, PHP_URL_HOST);
+       if (empty($url_host)) {
+               $url_host = parse_url(DI::baseUrl(), PHP_URL_HOST);
+       }
+
        $contact_url_host = parse_url($contact_url, PHP_URL_HOST);
 
        if ($url_host == $contact_url_host) {