X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fredir.php;h=8c04d711ed69288168585521df6533ced96da158;hb=9f2196aa1aa0dc112e3fc238832828d4e22fe137;hp=d29159ed0342c91a2c652932508a7ed90c8382dc;hpb=1febf182ad42482bb483738fa35ddc0a54141076;p=friendica.git

diff --git a/include/redir.php b/include/redir.php
index d29159ed03..8c04d711ed 100644
--- a/include/redir.php
+++ b/include/redir.php
@@ -1,16 +1,19 @@
 <?php
 
-function auto_redir(&$a, $contact_nick) {
+use Friendica\App;
+use Friendica\Core\System;
+
+function auto_redir(App $a, $contact_nick) {
 
 	// prevent looping
 
-	if(x($_REQUEST,'redir') && intval($_REQUEST['redir']))
+	if (x($_REQUEST,'redir') && intval($_REQUEST['redir']))
 		return;
 
-	if((! $contact_nick) || ($contact_nick === $a->user['nickname']))
+	if ((! $contact_nick) || ($contact_nick === $a->user['nickname']))
 		return;
 
-	if(local_user()) {
+	if (local_user()) {
 
 		// We need to find out if $contact_nick is a user on this hub, and if so, if I
 		// am a contact of that user. However, that user may have other contacts with the
@@ -20,9 +23,9 @@ function auto_redir(&$a, $contact_nick) {
 		//
 		// We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
 
-		$baseurl = App::get_baseurl();
+		$baseurl = System::baseUrl();
 		$domain_st = strpos($baseurl, "://");
-		if($domain_st === false)
+		if ($domain_st === false)
 			return;
 		$baseurl = substr($baseurl, $domain_st + 3);
 		$nurl = normalise_link($baseurl);
@@ -56,11 +59,11 @@ function auto_redir(&$a, $contact_nick) {
 
 		$dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
 
-		if($r[0]['duplex'] && $r[0]['issued-id']) {
+		if ($r[0]['duplex'] && $r[0]['issued-id']) {
 			$orig_id = $r[0]['issued-id'];
 			$dfrn_id = '1:' . $orig_id;
 		}
-		if($r[0]['duplex'] && $r[0]['dfrn-id']) {
+		if ($r[0]['duplex'] && $r[0]['dfrn-id']) {
 			$orig_id = $r[0]['dfrn-id'];
 			$dfrn_id = '0:' . $orig_id;
 		}
@@ -68,9 +71,9 @@ function auto_redir(&$a, $contact_nick) {
 		// ensure that we've got a valid ID. There may be some edge cases with forums and non-duplex mode
 		// that may have triggered some of the "went to {profile/intro} and got an RSS feed" issues
 
-		if(strlen($dfrn_id) < 3)
+		if (strlen($dfrn_id) < 3)
 			return;
-			
+
 		$sec = random_string();
 
 		q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
@@ -84,9 +87,9 @@ function auto_redir(&$a, $contact_nick) {
 
 		$url = curPageURL();
 
-		logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
+		logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
 		$dest = (($url) ? '&destination_url=' . $url : '');
-		goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
+		goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
 			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest );
 	}