X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=a158f31798cdf01313268c616e608b506ead8e05;hb=865006682a3952565035207898b80dfbd6d390b1;hp=2f97911dc3c9662385e5d83d9016897ce17eaab7;hpb=3a5523820cccf73f1702a384d80f4b6787d38553;p=friendica.git diff --git a/mod/redir.php b/mod/redir.php index 2f97911dc3..a158f31798 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -35,10 +35,9 @@ function redir_init(App $a) { } $url = $_GET['url'] ?? ''; - $quiet = !empty($_GET['quiet']) ? '&quiet=1' : ''; - if ($a->argc > 1 && intval($a->argv[1])) { - $cid = intval($a->argv[1]); + if (DI::args()->getArgc() > 1 && intval(DI::args()->getArgv()[1])) { + $cid = intval(DI::args()->getArgv()[1]); } else { $cid = 0; } @@ -58,7 +57,7 @@ function redir_init(App $a) { $contact_url = $contact['url']; - if (!empty($a->contact['id']) && $a->contact['id'] == $cid) { + if (!empty($a->getContactId()) && $a->getContactId() == $cid) { // Local user is already authenticated. redir_check_url($contact_url, $url); $a->redirect($url ?: $contact_url); @@ -73,7 +72,7 @@ function redir_init(App $a) { $cid = $contact['id']; } - if (!empty($a->contact['id']) && $a->contact['id'] == $cid) { + if (!empty($a->getContactId()) && $a->getContactId() == $cid) { // Local user is already authenticated. redir_check_url($contact_url, $url); $target_url = $url ?: $contact_url; @@ -143,7 +142,7 @@ function redir_magic($a, $cid, $url) } // Test for magic auth on the target system - $serverret = DI::httpRequest()->get($basepath . '/magic'); + $serverret = DI::httpClient()->get($basepath . '/magic'); if ($serverret->isSuccess()) { $separator = strpos($target_url, '?') ? '&' : '?'; $target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);