Merge pull request #3384 from strk/openid-register

Fix OpenID registration, and improve its robustness
This commit is contained in:
Hypolite Petovan 2017-04-23 08:55:51 -04:00 committed by GitHub
commit 772825690f

View file

@ -73,10 +73,10 @@ function openid_content(App $a) {
$first = notags(trim($v));
}
if($k === 'namePerson') {
$args .= '&username=' . notags(trim($v));
$args .= '&username=' . urlencode(notags(trim($v)));
}
if ($k === 'contact/email') {
$args .= '&email=' . notags(trim($v));
$args .= '&email=' . urlencode(notags(trim($v)));
}
if ($k === 'media/image/aspect11') {
$photosq = bin2hex(trim($v));
@ -87,22 +87,22 @@ function openid_content(App $a) {
}
}
if ($nick) {
$args .= '&nickname=' . $nick;
$args .= '&nickname=' . urlencode($nick);
}
elseif ($first) {
$args .= '&nickname=' . $first;
$args .= '&nickname=' . urlencode($first);
}
if ($photosq) {
$args .= '&photo=' . $photosq;
$args .= '&photo=' . urlencode($photosq);
}
elseif ($photo) {
$args .= '&photo=' . $photo;
$args .= '&photo=' . urlencode($photo);
}
$args .= '&openid_url=' . notags(trim($authid));
$args .= '&openid_url=' . urlencode(notags(trim($authid)));
goaway(App::get_baseurl() . '/register' . $args);
goaway(App::get_baseurl() . '/register?' . $args);
// NOTREACHED
}