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

Merge branch 'master' of git://github.com/friendika/friendika

Browse source
This commit is contained in:
root 2011-01-21 14:38:29 +01:00
commit e8897d4079
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mod/dfrn_request.php
View file

@ -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'] : '');
} }
/** /**

6
mod/follow.php
View file

@ -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
} }