X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=33b7d36f91b141e1dbbc944587cd9ac18666d1d4;hb=0cdf0ba422076f731a5801708879d5344439494a;hp=9f579a9dc445f3657fb2a3b6e2b249713d2174f3;hpb=69a73678ebc18ad27b27f1bf92bc9433b7e7066f;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index 9f579a9dc4..33b7d36f91 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -9,6 +9,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\Strings;
+use Friendica\Util\Network;
 
 function redir_init(App $a) {
 
@@ -34,8 +35,7 @@ function redir_init(App $a) {
 
 		$contact_url = $contact['url'];
 
-		if ($contact['network'] !== Protocol::DFRN // Authentication isn't supported for non DFRN contacts.
-			|| (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
+		if ((!local_user() && !remote_user()) // 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));
@@ -81,8 +81,17 @@ function redir_init(App $a) {
 			}
 		}
 
+		// When the remote page does support OWA, then we enforce the use of it
+		$basepath = Contact::getBasepath($contact_url);
+		if ($basepath == System::baseUrl()) {
+			$use_magic = true;
+		} else {
+			$serverret = Network::curl($basepath . '/magic');
+			$use_magic = $serverret->isSuccess();
+		}
+
 		// Doing remote auth with dfrn.
-		if (local_user() && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
+		if (local_user() && !$use_magic && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
 			$dfrn_id = $orig_id = (($contact['issued-id']) ? $contact['issued-id'] : $contact['dfrn-id']);
 
 			if ($contact['duplex'] && $contact['issued-id']) {