X-Git-Url: https://git-public.kairo.at/?p=authserver.git;a=blobdiff_plain;f=app%2Findex.php;h=ba0d0247e7e42bc500b84eb6181b717661e0c8f7;hp=90be17fe99ce2579a08d6c96e049cab82fb85075;hb=3875e0fb8b2b31d82809bd20880f1d206db4cb2c;hpb=9cab985cf8d73f719cd7efc2838ce2e107b45b21

diff --git a/app/index.php b/app/index.php
index 90be17f..ba0d024 100644
--- a/app/index.php
+++ b/app/index.php
@@ -6,28 +6,11 @@
 // Include the common auth system files (including the OAuth2 Server object).
 require_once(__DIR__.'/authsystem.inc.php');
 
-// Start HTML document as a DOM object.
-extract(ExtendedDocument::initHTML5()); // sets $document, $html, $head, $title, $body
-$document->formatOutput = true; // we want a nice output
-
-$style = $head->appendElement('link');
-$style->setAttribute('rel', 'stylesheet');
-$style->setAttribute('href', 'authsystem.css');
-$head->appendJSFile('authsystem.js');
-$title->appendText('KaiRo.at Authentication Server');
-$h1 = $body->appendElement('h1', 'KaiRo.at Authentication Server');
-
-// Make the document not be scaled on mobile devices.
-$vpmeta = $head->appendElement('meta');
-$vpmeta->setAttribute('name', 'viewport');
-$vpmeta->setAttribute('content', 'width=device-width, height=device-height');
-
 $errors = $utils->checkForSecureConnection();
 $utils->sendSecurityHeaders();
 
-$para = $body->appendElement('p', _('This login system does not work without JavaScript. Please activate JavaScript for this site to log in.'));
-$para->setAttribute('id', 'jswarning');
-$para->setAttribute('class', 'warn');
+// Initialize the HTML document with our basic elements.
+extract($utils->initHTMLDocument('KaiRo.at Authentication Server')); // sets $document, $html, $head, $title, $body
 
 if (!count($errors)) {
   $session = $utils->initSession(); // Read session or create new session and set cookie.
@@ -45,7 +28,7 @@ if (!count($errors)) {
     $session['logged_in'] = 0;
   }
   elseif (array_key_exists('email', $_POST)) {
-    if (!preg_match('/^[^@]+@[^@]+\.[^@]+$/', $_POST['email'])) {
+    if (!preg_match('/^[^@]+@([^@]+\.[^@]+|localhost)$/', $_POST['email'])) {
       $errors[] = _('The email address is invalid.');
     }
     elseif ($utils->verifyTimeCode(@$_POST['tcode'], $session)) {
@@ -212,7 +195,7 @@ if (!count($errors)) {
   }
   elseif (array_key_exists('reset', $_GET)) {
     if ($session['logged_in']) {
-      $result = $db->prepare('SELECT `id`,`email` FROM `auth_users` WHERE `id` = :userid;');
+      $result = $db->prepare('SELECT `id`,`email`,`group_id` FROM `auth_users` WHERE `id` = :userid;');
       $result->execute(array(':userid' => $session['user']));
       $user = $result->fetch(PDO::FETCH_ASSOC);
       if (!$user['id']) {
@@ -226,7 +209,7 @@ if (!count($errors)) {
     }
   }
   elseif (array_key_exists('verification_code', $_GET)) {
-    $result = $db->prepare('SELECT `id`,`email` FROM `auth_users` WHERE `email` = :email AND `status` = \'unverified\' AND `verify_hash` = :vcode;');
+    $result = $db->prepare('SELECT `id`,`email`,`group_id` FROM `auth_users` WHERE `email` = :email AND `status` = \'unverified\' AND `verify_hash` = :vcode;');
     $result->execute(array(':email' => @$_GET['email'], ':vcode' => $_GET['verification_code']));
     $user = $result->fetch(PDO::FETCH_ASSOC);
     if ($user['id']) {
@@ -243,7 +226,7 @@ if (!count($errors)) {
   }
   elseif (array_key_exists('reset_code', $_GET)) {
     $reset_fail = true;
-    $result = $db->prepare('SELECT `id`,`email`,`verify_hash` FROM `auth_users` WHERE `email` = :email');
+    $result = $db->prepare('SELECT `id`,`email`,`verify_hash`,`group_id` FROM `auth_users` WHERE `email` = :email');
     $result->execute(array(':email' => @$_GET['email']));
     $user = $result->fetch(PDO::FETCH_ASSOC);
     if ($user['id']) {
@@ -278,7 +261,7 @@ if (!count($errors)) {
     }
   }
   elseif (array_key_exists('clients', $_GET)) {
-    $result = $db->prepare('SELECT `id`,`email` FROM `auth_users` WHERE `id` = :userid;');
+    $result = $db->prepare('SELECT `id`,`email`,`group_id` FROM `auth_users` WHERE `id` = :userid;');
     $result->execute(array(':userid' => $session['user']));
     $user = $result->fetch(PDO::FETCH_ASSOC);
     if ($session['logged_in'] && $user['id']) {
@@ -479,7 +462,7 @@ if (!count($errors)) {
     $link = $litem->appendLink('./?logout', _('Log out'));
     $litem = $ulist->appendElement('li');
     $link = $litem->appendLink('./?addemail', _('Add another email address'));
-    if (in_array($user['email'], $utils->client_reg_email_whitelist)) {
+    if (($utils->client_reg_email_whitelist === false) || (in_array($user['email'], $utils->client_reg_email_whitelist))) {
       $litem = $ulist->appendElement('li');
       $link = $litem->appendLink('./?clients', _('Manage OAuth2 clients'));
     }
@@ -512,7 +495,8 @@ if (count($errors)) {
   $list = $body->appendElement('ul');
   $list->setAttribute('class', 'flat warn');
   foreach ($errors as $msg) {
-    $item = $list->appendElement('li', $msg);
+    $item = $list->appendElement('li');
+    $item->appendHTMLMarkup($msg);
   }
   $body->appendButton(_('Back'), 'history.back();');
 }