salmon error handling issue
This commit is contained in:
parent
1b14c1733b
commit
1278305de9
3 changed files with 5 additions and 3 deletions
|
@ -114,7 +114,7 @@ else {
|
||||||
// new account
|
// new account
|
||||||
$_SESSION['register'] = 1;
|
$_SESSION['register'] = 1;
|
||||||
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
|
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
|
||||||
$openid->optional = array('namePerson/first');
|
$openid->optional = array('namePerson/first','media/image/aspect11');
|
||||||
goaway($openid->authUrl());
|
goaway($openid->authUrl());
|
||||||
// NOTREACHED
|
// NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
|
@ -182,7 +182,9 @@ EOT;
|
||||||
|
|
||||||
// check for success, e.g. 2xx
|
// check for success, e.g. 2xx
|
||||||
|
|
||||||
if(($return_code >= 200) && ($return_code < 300)) {
|
if($return_code > 299) {
|
||||||
|
|
||||||
|
logger('slapper: compliant salmon failed. Falling back to status.net hack');
|
||||||
|
|
||||||
// Entirely likely that their salmon implementation is
|
// Entirely likely that their salmon implementation is
|
||||||
// non-compliant. Let's try once more, this time only signing
|
// non-compliant. Let's try once more, this time only signing
|
||||||
|
|
|
@ -49,7 +49,7 @@ function register_post(&$a) {
|
||||||
$openid->identity = $openid_url;
|
$openid->identity = $openid_url;
|
||||||
$openid->returnUrl = $a->get_baseurl() . '/openid';
|
$openid->returnUrl = $a->get_baseurl() . '/openid';
|
||||||
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
|
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
|
||||||
$openid->optional = array('namePerson/first');
|
$openid->optional = array('namePerson/first','media/image/aspect11');
|
||||||
goaway($openid->authUrl());
|
goaway($openid->authUrl());
|
||||||
// NOTREACHED
|
// NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue