X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fredir.php;h=dac03f92c7e1153b5dc6dfda97e337cb2ea639c5;hb=465e1d6a5ca86794d3359536fcf2735889fbbc03;hp=8c04d711ed69288168585521df6533ced96da158;hpb=541d6ab8959fe3c069996e230def126c154da34d;p=friendica.git

diff --git a/include/redir.php b/include/redir.php
index 8c04d711ed..dac03f92c7 100644
--- a/include/redir.php
+++ b/include/redir.php
@@ -2,19 +2,20 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
-function auto_redir(App $a, $contact_nick) {
-
+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()) {
-
 		// 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
 		// same nickname as me on other hubs or other networks. Exclude these by requiring
@@ -25,8 +26,9 @@ function auto_redir(App $a, $contact_nick) {
 
 		$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);
 
@@ -38,8 +40,7 @@ function auto_redir(App $a, $contact_nick) {
 				dbesc($baseurl),
 				dbesc($nurl)
 		);
-
-		if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) {
+		if ((! DBM::is_result($r)) || $r[0]['id'] == remote_user()) {
 			return;
 		}
 
@@ -50,14 +51,13 @@ function auto_redir(App $a, $contact_nick) {
 		       intval(local_user()),
 		       dbesc($baseurl)
 		);
-
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			return;
 		}
 
 		$cid = $r[0]['id'];
 
-		$dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+		$dfrn_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
 
 		if ($r[0]['duplex'] && $r[0]['issued-id']) {
 			$orig_id = $r[0]['issued-id'];
@@ -71,8 +71,9 @@ function auto_redir(App $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();