kopia lustrzana https://github.com/friendica/friendica
Merge branch 'master' of git://github.com/friendika/friendika
commit
e8897d4079
|
@ -590,8 +590,12 @@ function dfrn_request_content(&$a) {
|
||||||
$myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 );
|
$myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
elseif($x($_GET,'addr')) {
|
||||||
$myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : '');
|
$myaddr = hex2bin($_GET['addr']);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
/* $_GET variables are already urldecoded */
|
||||||
|
$myaddr = ((x($_GET,'address')) ? $_GET['address'] : '');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -38,11 +38,11 @@ function follow_post(&$a) {
|
||||||
$ret = scrape_dfrn($dfrn);
|
$ret = scrape_dfrn($dfrn);
|
||||||
if(is_array($ret) && x($ret,'dfrn-request')) {
|
if(is_array($ret) && x($ret,'dfrn-request')) {
|
||||||
if(strlen($a->path))
|
if(strlen($a->path))
|
||||||
$myaddr = urlencode($a->get_baseurl() . '/profile/' . $a->user['nickname']);
|
$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
|
||||||
else
|
else
|
||||||
$myaddr = urlencode($a->user['nickname'] . '@' . $a->get_hostname());
|
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
|
||||||
|
|
||||||
goaway($ret['dfrn-request'] . "&address=$myaddr");
|
goaway($ret['dfrn-request'] . "&addr=$myaddr");
|
||||||
|
|
||||||
// NOTREACHED
|
// NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue