strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Coding convention applied - part 1"

Browse source
This commit is contained in:
Hypolite Petovan 2017-03-21 12:02:59 -04:00 • committed by GitHub
commit 7b352f3f74
181 changed files with 3519 additions and 4350 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/redir.php
View file

@ -4,13 +4,13 @@ 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
@ -22,7 +22,7 @@ function auto_redir(App $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 +56,11 @@ function auto_redir(App $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,7 +68,7 @@ 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();