Move break rule in footer (#124)

* Update footer.php

* Change line break to pipe

* Remove full stop

Co-authored-by: Alexander Davis <alex@adcm.uk>

app/includes/app_functions.php

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

app/includes/footer.php

@@ -3,7 +3,7 @@
     <?php
       echo($_ENV['APP_NAME'] . " " . get_version());
       if ($_ENV['APP_NAME'] != "FHeD") {
-          echo(", powered by FHeD");
+          echo("| Powered by FHeD");
       };
     ?><br>
     <?php if (is_signed_in()) {

app/public/actions/login.php

@@ -17,16 +17,7 @@
         $alert = array("danger", "Error during OpenID Connect authentication: " . $e->getMessage());
     }
 
-    // Check if the user already exists
+    if (user_exists($db, $oidc_user['sub']) == false) {
-    try {
-      $user_exist_sql = $db->prepare("SELECT uuid FROM users WHERE uuid=:uuid");
-      $user_exist_sql->bindParam(':uuid', $oidc_user['sub']);
-      $user_exist_sql->execute();
-    } catch (PDOException $e) {
-      $alert = array("danger", "Error during check for user record: " . $e->getMessage());
-    }
-
-    if (empty($user_exist_sql)) {
         // User doesn't already exist
         try {
             $stmt = "INSERT INTO users (uuid, uid, given_name, family_name, email) VALUES (:sub, :username, :given, :family, :email)";
@@ -37,7 +28,9 @@
             $sql->bindParam(':family', $oidc_user['family_name']);
             $sql->bindParam(':email', $oidc_user['email']);
             $sql->execute();
-      } catch (Jumbojett\PDOException $e) {
+        } catch (PDOException $e) {
+            echo("Error during creation of new user record: " . $e->getMessage());
+            die();
             $alert = array("danger", "Error during creation of new user record: " . $e->getMessage());
         }
     } else {
@@ -51,7 +44,9 @@
             $sql->bindParam(':family', $oidc_user['family_name']);
             $sql->bindParam(':email', $oidc_user['email']);
             $sql->execute();
-      } catch (Jumbojett\PDOException $e) {
+        } catch (PDOException $e) {
+            echo("Error during existing user record update: " . $e->getMessage());
+            die();
             $alert = array("danger", "Error during existing user record update: " . $e->getMessage());
         }
     }
@@ -62,4 +57,3 @@
     $_SESSION['is_signed_in'] = "true";
 
     header('Location: /');
-?>