aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2012-09-17 23:13:38 +0200
committerChristian Weiske <cweiske@cweiske.de>2012-09-17 23:13:38 +0200
commit2017065c9b89d4f435e86d03d28c219edcdf5bf9 (patch)
tree32df84e066c2a7311c1420588b61e09b13ca0f62
parent7fc0b4b6f2f6dd25cc16316b02c2d24006acf3fe (diff)
downloadphorkie-2017065c9b89d4f435e86d03d28c219edcdf5bf9.tar.gz
phorkie-2017065c9b89d4f435e86d03d28c219edcdf5bf9.zip
reformat attribute reading
-rw-r--r--www/login.php36
1 files changed, 26 insertions, 10 deletions
diff --git a/www/login.php b/www/login.php
index 1feb3ce..e4438a4 100644
--- a/www/login.php
+++ b/www/login.php
@@ -197,16 +197,32 @@ if (isset($_POST['start'])) {
$openid = $message->getArrayFormat();
- $email = (isset($openid['openid.ext1.value.email'])) ? $openid['openid.ext1.value.email'] : null;
- $email = (isset($openid['openid.ext2.value.email']) && !isset($email)) ? $openid['openid.ext2.value.email'] : $email;
- $email = (isset($openid['openid.sreg.email']) && !isset($email)) ? $openid['openid.sreg.email'] : $email;
- $email = (isset($openid['openid.ax.value.email']) && !isset($email)) ? $openid['openid.ax.value.email'] : $email;
- $_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.fullname']) && !isset($name)) ? $openid['openid.sreg.fullname'] : $name;
- $_SESSION['name'] = (isset($name)) ? $name : $_SERVER['REMOTE_ADDR'];
-
+ $email = isset($openid['openid.ext1.value.email'])
+ ? $openid['openid.ext1.value.email']
+ : null;
+ $email = isset($openid['openid.ext2.value.email']) && !isset($email)
+ ? $openid['openid.ext2.value.email']
+ : $email;
+ $email = isset($openid['openid.sreg.email']) && !isset($email)
+ ? $openid['openid.sreg.email']
+ : $email;
+ $email = isset($openid['openid.ax.value.email']) && !isset($email)
+ ? $openid['openid.ax.value.email']
+ : $email;
+ $_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.fullname']) && !isset($name)
+ ? $openid['openid.sreg.fullname']
+ : $name;
+
+ $_SESSION['name'] = isset($name) ? $name : $_SERVER['REMOTE_ADDR'];
$_SESSION['identity'] = $openid['openid.identity'];
$redirect = 'http://' . $_SERVER['HTTP_HOST'] . $_SESSION['REQUEST_URI'];