X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=c99e1823c76c84f05de01e5a7a3adbe622909e34;hb=80f81e670c721067cddf0ffff4ed4f2def1ad69c;hp=e448aa36d3f200eb52a61ebc81d103774d3460c0;hpb=2fa6cc000013089d59d9cc221b544ed1a7a4cd37;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index e448aa36d3..c99e1823c7 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -2,10 +2,14 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Session;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 function redir_init(App $a) {
 
@@ -22,41 +26,40 @@ function redir_init(App $a) {
 	}
 
 	if (!empty($cid)) {
-		$fields = ['id', 'uid', 'nurl', 'url', 'addr', 'name', 'network', 'poll', 'issued-id', 'dfrn-id', 'duplex'];
-		$contact = dba::selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, local_user()]]);
-		if (!DBM::is_result($contact)) {
+		$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.'));
-			goaway(System::baseUrl());
+			$a->internalRedirect();
 		}
 
 		$contact_url = $contact['url'];
 
-		if ($contact['network'] !== NETWORK_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.
 		{
-			goaway($url != '' ? $url : $contact_url);
+			$a->redirect(defaults($url, $contact_url));
 		}
 
 		if ($contact['uid'] == 0 && local_user()) {
 			// Let's have a look if there is an established connection
-			// between the puplic contact we have found and the local user.
-			$contact = dba::selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => local_user()]);
+			// between the public contact we have found and the local user.
+			$contact = DBA::selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => local_user()]);
 
-			if (DBM::is_result($contact)) {
+			if (DBA::isResult($contact)) {
 				$cid = $contact['id'];
 			}
 
 			if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
 				// Local user is already authenticated.
-				$target_url = $url != '' ? $url : $contact_url;
-				logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
-				goaway($target_url);
+				$target_url = defaults($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(System::baseUrl() . ($a->urlpath ? '/' . $a->urlpath : ''), strpos(System::baseUrl(), '://') + 3);
+			$host = substr($a->getBaseURL() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''), strpos($a->getBaseURL(), '://') + 3);
 			$remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1);
 
 			// On a local instance we have to check if the local user has already authenticated
@@ -64,22 +67,33 @@ function redir_init(App $a) {
 			// for authentification everytime he/she is visiting a profile page of the local
 			// contact.
 			if ($host == $remotehost
-				&& x($_SESSION, 'remote')
+				&& !empty($_SESSION['remote'])
 				&& is_array($_SESSION['remote']))
 			{
 				foreach ($_SESSION['remote'] as $v) {
-					if ($v['uid'] == $_SESSION['visitor_visiting'] && $v['cid'] == $_SESSION['visitor_id']) {
+					if (!empty($v['uid']) && !empty($v['cid']) &&
+					    $v['uid'] == Session::get('visitor_visiting') &&
+					    $v['cid'] == Session::get('visitor_id')) {
 						// Remote user is already authenticated.
-						$target_url = $url != '' ? $url : $contact_url;
-						logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
-						goaway($target_url);
+						$target_url = defaults($url, $contact_url);
+						Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
+						$a->redirect($target_url);
 					}
 				}
 			}
 		}
 
+		// When the remote page does support OWA, then we enforce the use of it
+		$basepath = Contact::getBasepath($contact_url);
+		if (Strings::compareLink($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']))) {
+		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']) {
@@ -91,21 +105,21 @@ function redir_init(App $a) {
 				$dfrn_id = '0:' . $orig_id;
 			}
 
-			$sec = random_string();
+			$sec = Strings::getRandomHex();
 
 			$fields = ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
 				'sec' => $sec, 'expire' => time() + 45];
-			dba::insert('profile_check', $fields);
+			DBA::insert('profile_check', $fields);
 
-			logger('mod_redir: ' . $contact['name'] . ' ' . $sec, LOGGER_DEBUG);
+			Logger::log('mod_redir: ' . $contact['name'] . ' ' . $sec, Logger::DEBUG);
 
 			$dest = (!empty($url) ? '&destination_url=' . $url : '');
 
-			goaway($contact['poll'] . '?dfrn_id=' . $dfrn_id
+			System::externalRedirect($contact['poll'] . '?dfrn_id=' . $dfrn_id
 				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
 		}
 
-		$url = $url != '' ? $url : $contact_url;
+		$url = defaults($url, $contact_url);
 	}
 
 	// If we don't have a connected contact, redirect with
@@ -113,16 +127,16 @@ function redir_init(App $a) {
 	if (!empty($url)) {
 		$my_profile = Profile::getMyURL();
 
-		if (!empty($my_profile) && !link_compare($my_profile, $url)) {
+		if (!empty($my_profile) && !Strings::compareLink($my_profile, $url)) {
 			$separator = strpos($url, '?') ? '&' : '?';
 
 			$url .= $separator . 'zrl=' . urlencode($my_profile);
 		}
 
-		logger('redirecting to ' . $url, LOGGER_DEBUG);
-		goaway($url);
+		Logger::log('redirecting to ' . $url, Logger::DEBUG);
+		$a->redirect($url);
 	}
 
 	notice(L10n::t('Contact not found.'));
-	goaway(System::baseUrl());
+	$a->internalRedirect();
 }