reformat attribute reading

[phorkie.git] / www / login.php

diff --git a/www/login.php b/www/login.php
index f05f98014e0cf679b1099c849294ed32c66d632b..e4438a4797062d4e9d4248ff562573a90e662f92 100644 (file)
--- a/www/login.php
+++ b/www/login.php
@@ -18,6 +18,7 @@ set_include_path(
     . PATH_SEPARATOR . get_include_path()
 );
 
+$pageRequiresLogin = false;
 require_once 'www-header.php';
 require_once 'openid/config.php';
 
@@ -89,8 +90,7 @@ if (isset($_POST['start'])) {
 
     // 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
@@ -197,17 +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.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;
-    $_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'];