X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=ba1b7e13b6a9f45cfe957c57816e31f553942f56;hb=6f70d21e07f5ae3ad96efe7c399db17ad390b73a;hp=2f97911dc3c9662385e5d83d9016897ce17eaab7;hpb=3a5523820cccf73f1702a384d80f4b6787d38553;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index 2f97911dc3..ba1b7e13b6 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,6 +27,8 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Util\Strings;
 
 function redir_init(App $a) {
@@ -35,10 +37,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 +59,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,11 +74,11 @@ 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;
-			Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
+			Logger::info($contact['name'] . " is already authenticated. Redirecting to " . $target_url);
 			$a->redirect($target_url);
 		}
 	}
@@ -94,7 +95,7 @@ function redir_init(App $a) {
 			// Remote user is already authenticated.
 			redir_check_url($contact_url, $url);
 			$target_url = $url ?: $contact_url;
-			Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
+			Logger::info($contact['name'] . " is already authenticated. Redirecting to " . $target_url);
 			$a->redirect($target_url);
 		}
 	}
@@ -113,7 +114,7 @@ function redir_init(App $a) {
 		$url .= $separator . 'zrl=' . urlencode($my_profile);
 	}
 
-	Logger::log('redirecting to ' . $url, Logger::DEBUG);
+	Logger::info('redirecting to ' . $url);
 	$a->redirect($url);
 }
 
@@ -143,7 +144,7 @@ function redir_magic($a, $cid, $url)
 	}
 
 	// Test for magic auth on the target system
-	$serverret = DI::httpRequest()->get($basepath . '/magic');
+	$serverret = DI::httpClient()->head($basepath . '/magic', [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::HTML]);
 	if ($serverret->isSuccess()) {
 		$separator = strpos($target_url, '?') ? '&' : '?';
 		$target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);