try {
$o = new \OpenID_RelyingParty($returnTo, $realm, $openid_url);
} catch (OpenID_Exception $e) {
- $contents = "<div class='openid_results'>\n";
- $contents .= "<pre>" . $e->getMessage() . "</pre>\n";
- $contents .= "</div class='openid_results'>";
- include_once 'openid/wrapper.php';
- exit;
+ throw new Exception($e->getMessage());
}
if (!empty($_POST['disable_associations']) || !empty($_SESSION['disable_associations'])) {
try {
$authRequest = $o->prepare();
} catch (OpenID_Exception $e) {
- $contents = "<div class='openid_results'>\n";
- $contents .= "<pre>" . $e->getMessage() . "</pre>\n";
- $contents .= "</div class='openid_results'>";
- include_once 'openid/wrapper.php';
- exit;
+ throw new Exception($e->getMessage());
}
// SREG
$sreg->set('required', 'email,fullname');
$authRequest->addExtension($sreg);
- // AX
+ // AX, http://stackoverflow.com/a/7657061/282601
$ax = new \OpenID_Extension_AX(\OpenID_Extension::REQUEST);
$ax->set('type.email', 'http://axschema.org/contact/email');
$ax->set('type.firstname', 'http://axschema.org/namePerson/first');
$ax->set('type.lastname', 'http://axschema.org/namePerson/last');
+ $ax->set('type.fullname', 'http://axschema.org/namePerson');
$ax->set('mode', 'fetch_request');
- $ax->set('required', 'email,firstname,lastname');
+ $ax->set('required', 'email,firstname,lastname,fullname');
$authRequest->addExtension($ax);
$url = $authRequest->getAuthorizeURL();
$email = isset($openid['openid.sreg.email']) && !isset($email)
? $openid['openid.sreg.email']
: $email;
-$email = isset($openid['openid.ax.value.email']) && !isset($email)
+$email = isset($openid['openid.ax.value.email'])
+ && isset($openid['openid.ax.type.email'])
+ && $openid['openid.ax.type.email'] == 'http://axschema.org/contact/email'
+ && !isset($email)
? $openid['openid.ax.value.email']
: $email;
$_SESSION['email'] = isset($email)
$name = isset($openid['openid.sreg.fullname']) && !isset($name)
? $openid['openid.sreg.fullname']
: $name;
+$name = isset($openid['openid.ax.value.fullname'])
+ && isset($openid['openid.ax.type.fullname'])
+ && $openid['openid.ax.type.fullname'] == 'http://axschema.org/namePerson'
+ && !isset($name)
+ ? $openid['openid.ax.value.fullname']
+ : $name;
$_SESSION['name'] = isset($name) ? $name : $_SERVER['REMOTE_ADDR'];
$_SESSION['identity'] = $openid['openid.identity'];