2 Commits

Author SHA1 Message Date
Alexander Davis
26c4f801d3 Broken login (#122)
* Fixing Login Die

* Fix Broken Login 2

* Update footer

* Try Somethin New Today
2020-08-17 17:04:34 +01:00
Alexander Davis
49581da52c Broken login (#121)
* Fixing Login Die

* Fix Broken Login 2
2020-08-17 16:48:13 +01:00
3 changed files with 9 additions and 6 deletions

View File

@@ -12,13 +12,16 @@
$sql = $db->prepare("SELECT uuid FROM users WHERE uuid=:uuid"); $sql = $db->prepare("SELECT uuid FROM users WHERE uuid=:uuid");
$sql->bindParam(':uuid', $uuid); $sql->bindParam(':uuid', $uuid);
$sql->execute(); $sql->execute();
$sql->setFetchMode(PDO::FETCH_ASSOC);
$result = $sql->fetchAll();
} catch (PDOException $e) { } catch (PDOException $e) {
$alert = array("danger", "Error during check for user record: " . $e->getMessage()); $alert = array("danger", "Error during check for user record: " . $e->getMessage());
die();
} }
if (empty($sql)) { if (empty($result)) {
return false; return false;
} else { } else {
return true; return true;
} }
} }

View File

@@ -1,9 +1,9 @@
<footer class="footer mt-auto py-3"> <footer class="footer mt-auto py-3">
<div class="text-center text-muted"> <div class="text-center text-muted">
<?php <?php
echo($_ENV['APP_NAME'] . " " . get_version()); echo($_ENV['APP_NAME'] . " " . get_version() . "<br>");
if ($_ENV['APP_NAME'] != "FHeD") { if ($_ENV['APP_NAME'] != "FHeD") {
echo(", powered by FHeD"); echo("Powered by FHeD.");
}; };
?><br> ?><br>
<?php if (is_signed_in()) { <?php if (is_signed_in()) {

View File

@@ -17,7 +17,7 @@
$alert = array("danger", "Error during OpenID Connect authentication: " . $e->getMessage()); $alert = array("danger", "Error during OpenID Connect authentication: " . $e->getMessage());
} }
if (!user_exists($db, $uuid)) { if (user_exists($db, $oidc_user['sub']) == false) {
// User doesn't already exist // User doesn't already exist
try { try {
$stmt = "INSERT INTO users (uuid, uid, given_name, family_name, email) VALUES (:sub, :username, :given, :family, :email)"; $stmt = "INSERT INTO users (uuid, uid, given_name, family_name, email) VALUES (:sub, :username, :given, :family, :email)";