git.cweiske.de
/
phorkie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
972d5d8
)
request full name from OpenID provider (sreg)
author
Christian Weiske
<cweiske@cweiske.de>
Mon, 17 Sep 2012 21:05:41 +0000
(23:05 +0200)
committer
Christian Weiske
<cweiske@cweiske.de>
Mon, 17 Sep 2012 21:05:41 +0000
(23:05 +0200)
www/login.php
patch
|
blob
|
history
diff --git
a/www/login.php
b/www/login.php
index b8cb5124f4ed738b0ac40d34ad9ebe42be5f62c6..1feb3ce5b0cd3aa24188e90a53907acadff953c6 100644
(file)
--- a/
www/login.php
+++ b/
www/login.php
@@
-90,8
+90,7
@@
if (isset($_POST['start'])) {
// SREG
$sreg = new \OpenID_Extension_SREG11(\OpenID_Extension::REQUEST);
// SREG
$sreg = new \OpenID_Extension_SREG11(\OpenID_Extension::REQUEST);
- $sreg->set('required', 'email,firstname,lastname,nickname');
- $sreg->set('optional', 'gender,dob');
+ $sreg->set('required', 'email,fullname');
$authRequest->addExtension($sreg);
// AX
$authRequest->addExtension($sreg);
// AX
@@
-205,8
+204,7
@@
if (isset($_POST['start'])) {
$_SESSION['email'] = (isset($email)) ? $email : $GLOBALS['phorkie']['auth']['anonymousEmail'];
$name = (isset($openid['openid.ext1.value.firstname']) && isset($openid['openid.ext1.value.lastname'])) ? $openid['openid.ext1.value.firstname']." ".$openid['openid.ext1.value.lastname'] : null;
$_SESSION['email'] = (isset($email)) ? $email : $GLOBALS['phorkie']['auth']['anonymousEmail'];
$name = (isset($openid['openid.ext1.value.firstname']) && isset($openid['openid.ext1.value.lastname'])) ? $openid['openid.ext1.value.firstname']." ".$openid['openid.ext1.value.lastname'] : null;
- $name = (isset($openid['openid.sreg.firstname']) && isset($openid['openid.sreg.lastname']) && !isset($name)) ? $openid['openid.sreg.firstname']." ".$openid['openid.sreg.lastname'] : $name;
- $name = (isset($openid['openid.sreg.nickname']) && !isset($name)) ? $openid['openid.sreg.nickname'] : $name;
+ $name = (isset($openid['openid.sreg.fullname']) && !isset($name)) ? $openid['openid.sreg.fullname'] : $name;
$_SESSION['name'] = (isset($name)) ? $name : $_SERVER['REMOTE_ADDR'];
$_SESSION['identity'] = $openid['openid.identity'];
$_SESSION['name'] = (isset($name)) ? $name : $_SERVER['REMOTE_ADDR'];
$_SESSION['identity'] = $openid['openid.identity'];