X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=56cb13a06b97bc24adaf9005ad27b9f50086592c;hb=62f3c1f4b8b63bba6117ac50a49387fafd71a90a;hp=12d93186e29d65e9a02052fa599ef9661cd59961;hpb=0185c912460eef341b83d1724ded693fff151b81;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index 12d93186e2..56cb13a06b 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,11 +1,30 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\Network;
@@ -13,7 +32,7 @@ use Friendica\Util\Strings;
 
 function redir_init(App $a) {
 
-	$url = defaults($_GET, 'url', '');
+	$url = $_GET['url'] ?? '';
 	$quiet = !empty($_GET['quiet']) ? '&quiet=1' : '';
 
 	if ($a->argc > 1 && intval($a->argv[1])) {
@@ -29,8 +48,8 @@ function redir_init(App $a) {
 		$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.'));
-			$a->internalRedirect();
+			notice(DI::l10n()->t('Contact not found.'));
+			DI::baseUrl()->redirect();
 		}
 
 		$contact_url = $contact['url'];
@@ -38,7 +57,7 @@ function redir_init(App $a) {
 		if (!Session::isAuthenticated() // 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));
+			$a->redirect($url ?: $contact_url);
 		}
 
 		if ($contact['uid'] == 0 && local_user()) {
@@ -52,14 +71,14 @@ function redir_init(App $a) {
 
 			if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
 				// Local user is already authenticated.
-				$target_url = defaults($url, $contact_url);
+				$target_url = $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($a->getBaseURL() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''), strpos($a->getBaseURL(), '://') + 3);
+			$host = substr(DI::baseUrl()->getUrlPath() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : ''), strpos(DI::baseUrl()->getUrlPath(), '://') + 3);
 			$remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1);
 
 			// On a local instance we have to check if the local user has already authenticated
@@ -68,7 +87,7 @@ function redir_init(App $a) {
 			// contact.
 			if (($host == $remotehost) && (Session::getRemoteContactID(Session::get('visitor_visiting')) == Session::get('visitor_id'))) {
 				// Remote user is already authenticated.
-				$target_url = defaults($url, $contact_url);
+				$target_url = $url ?: $contact_url;
 				Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
 				$a->redirect($target_url);
 			}
@@ -101,7 +120,7 @@ function redir_init(App $a) {
 				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
 		}
 
-		$url = defaults($url, $contact_url);
+		$url = $url ?: $contact_url;
 	}
 
 	// If we don't have a connected contact, redirect with
@@ -119,8 +138,8 @@ function redir_init(App $a) {
 		$a->redirect($url);
 	}
 
-	notice(L10n::t('Contact not found.'));
-	$a->internalRedirect();
+	notice(DI::l10n()->t('Contact not found.'));
+	DI::baseUrl()->redirect();
 }
 
 function redir_magic($a, $cid, $url)
@@ -134,23 +153,23 @@ function redir_magic($a, $cid, $url)
 	if (!DBA::isResult($contact)) {
 		Logger::info('Contact not found', ['id' => $cid]);
 		// Shouldn't happen under normal conditions
-		notice(L10n::t('Contact not found.'));
+		notice(DI::l10n()->t('Contact not found.'));
 		if (!empty($url)) {
-			$a->redirect($url);
+			System::externalRedirect($url);
 		} else {
-			$a->internalRedirect();
+			DI::baseUrl()->redirect();
 		}
 	} else {
 		$contact_url = $contact['url'];
-		$target_url = defaults($url, $contact_url);
+		$target_url = $url ?: $contact_url;
 	}
 
 	$basepath = Contact::getBasepath($contact_url);
 
 	// We don't use magic auth when there is no visitor, we are on the same system or we visit our own stuff
-	if (empty($visitor) || Strings::compareLink($basepath, System::baseUrl()) || Strings::compareLink($contact_url, $visitor)) {
+	if (empty($visitor) || Strings::compareLink($basepath, DI::baseUrl()) || Strings::compareLink($contact_url, $visitor)) {
 		Logger::info('Redirecting without magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
-		$a->redirect($target_url);
+		DI::app()->redirect($target_url);
 	}
 
 	// Test for magic auth on the target system
@@ -160,7 +179,7 @@ function redir_magic($a, $cid, $url)
 		$target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);
 
 		Logger::info('Redirecting with magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
-		$a->redirect($target_url);
+		System::externalRedirect($target_url);
 	} else {
 		Logger::info('No magic for contact', ['contact' => $contact_url]);
 	}