X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fredir.php;h=d6b8285cfc08180fe379311733d65318c513458b;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=d29159ed0342c91a2c652932508a7ed90c8382dc;hpb=df8b522f6b96bc3a631e608ee430555590e91f0c;p=friendica.git diff --git a/include/redir.php b/include/redir.php index d29159ed03..d6b8285cfc 100644 --- a/include/redir.php +++ b/include/redir.php @@ -1,16 +1,18 @@ 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 @@ -22,7 +24,7 @@ function auto_redir(&$a, $contact_nick) { $baseurl = App::get_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 +58,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 +70,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 +86,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 ); }