Update dependency sentry/sdk to v3 (#138 )

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Update deploy.yml (#137 )
2020-09-28 19:26:51 +01:00 · 2020-09-08 22:16:27 +01:00 · 2020-09-05 16:43:48 +01:00 · 2020-08-31 19:16:33 +01:00 · 2020-08-18 20:14:08 +01:00 · 2020-08-18 18:32:29 +01:00
11 changed files with 2009 additions and 226 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,7 @@ jobs:
      - id: release
        uses: rymndhng/release-on-push-action@master
        with:
-          bump_version_scheme: minor
+          bump_version_scheme: patch
          
      - name: Check Output Parameters
        run: |
@@ -31,10 +31,10 @@ jobs:
    - name: Login to DockerHub Registry
      run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
    - name: Build image for Docker Hub
-      run: docker build . --file Dockerfile --build-arg VERSION=${{ needs.release-on-push.output.ver }} --tag luketainton/fhed:${{ needs.release-on-push.output.tag }} --tag luketainton/fhed:latest
+      run: docker build . --file Dockerfile --build-arg VERSION=${{ needs.release-on-push.outputs.ver }} --tag luketainton/fhed:${{ needs.release-on-push.outputs.tag }} --tag luketainton/fhed:latest
    - name: Push image to Docker Hub
      run: |
-        docker push luketainton/fhed:${{ needs.release-on-push.output.tag }} &&
+        docker push luketainton/fhed:${{ needs.release-on-push.outputs.tag }} &&
        docker push luketainton/fhed:latest
      
  docker-ghr:
@@ -46,10 +46,10 @@ jobs:
    - name: Login to DockerHub Registry
      run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u luketainton --password-stdin
    - name: Build image for GitHub Package Registry
-      run: docker build . --file Dockerfile --build-arg VERSION=${{ needs.release-on-push.output.ver }} --tag docker.pkg.github.com/luketainton/fhed/fhed:latest --tag docker.pkg.github.com/luketainton/fhed/fhed:${{ needs.release-on-push.output.tag }}
+      run: docker build . --file Dockerfile --build-arg VERSION=${{ needs.release-on-push.outputs.ver }} --tag docker.pkg.github.com/luketainton/fhed/fhed:latest --tag docker.pkg.github.com/luketainton/fhed/fhed:${{ needs.release-on-push.outputs.tag }}
    - name: Push image to GitHub Package Registry
      run: |
-        docker push docker.pkg.github.com/luketainton/fhed/fhed:${{ needs.release-on-push.output.tag }} &&
+        docker push docker.pkg.github.com/luketainton/fhed/fhed:${{ needs.release-on-push.outputs.tag }} &&
        docker push docker.pkg.github.com/luketainton/fhed/fhed:latest

  deploy:
--- a/2
+++ b/2
@@ -4,6 +4,8 @@ RUN composer --working-dir=/srv install

 FROM php:apache
 LABEL maintainer="Luke Tainton <luke@tainton.uk>"
+ARG VERSION
 RUN docker-php-ext-install pdo_mysql && a2enmod rewrite remoteip
 COPY vhost.conf /etc/apache2/sites-enabled/000-default.conf
 COPY --from=build /srv /srv
+RUN echo $VERSION > /srv/includes/VERSION
--- a/app/.env.sample
+++ b/app/.env.sample
@@ -13,3 +13,5 @@ OIDC_HOST          = ""
 OIDC_CLIENT_ID     = ""
 OIDC_CLIENT_SECRET = ""
 OIDC_DISABLE_SSL   = ""
+
+SENTRY_ENVIRONMENT = ""
--- a/app/composer.json
+++ b/app/composer.json
@@ -1,7 +1,8 @@
 {
-    "require": {
-        "ramsey/uuid": "^4.0",
-        "vlucas/phpdotenv": "^5.0",
-        "jumbojett/openid-connect-php": "^0.9.0"
-    }
+  "require": {
+    "ramsey/uuid": "^4.0",
+    "vlucas/phpdotenv": "^5.0",
+    "jumbojett/openid-connect-php": "^0.9.0",
+    "sentry/sdk": "^3.0"
+  }
 }
--- a/app/composer.lock
+++ b/app/composer.lock
--- a/app/includes/app_functions.php
+++ b/app/includes/app_functions.php
@@ -1,53 +1,105 @@
 <?php
-  function get_all_users($db) {
-    try {
-      $stmt = "SELECT * FROM users";
-      $sql = $db->prepare($stmt);
-      $sql->execute();
-      $sql->setFetchMode(PDO::FETCH_ASSOC);
-      $result = $sql->fetchAll();
-    } catch (PDOException $e) {
-      echo("Error: " . $e->getMessage());
-    }
-    return $result;
+
+  function get_version()
+  {
+      $version = "v" . file_get_contents(__DIR__ . '/VERSION');
+      return $version;
  }

-  function get_user_name($db, $user_uuid) {
-    try {
-      $stmt = "SELECT given_name, family_name FROM users WHERE uuid=:uuid";
-      $sql = $db->prepare($stmt);
-      $sql->bindParam(':uuid', $user_uuid);
-      $sql->execute();
-      $sql->setFetchMode(PDO::FETCH_ASSOC);
-      $result = $sql->fetchAll();
-      $usr = $result[0]['given_name'] . " " . $result[0]['family_name'];
-    } catch (PDOException $e) {
-      echo("Error: " . $e->getMessage());
-    }
-    return $usr;
+  function oidc_set_vars($sub, $uid, $fname, $lname, $email)
+  {
+      $_SESSION['uuid'] = $sub;
+      $_SESSION['username'] = $uid;
+      $_SESSION['given_name'] = $fname;
+      $_SESSION['family_name'] = $lname;
+      $_SESSION['full_name'] = $fname . " " . $lname;
+      $_SESSION['email'] = $email;
  }

-  function get_my_open_requests($db) {
-    $ticket_stmt = "SELECT * FROM tickets WHERE created_by=:uuid AND status != 'Closed'";
-    $ticket_sql = $db->prepare($ticket_stmt);
-    $ticket_sql->bindParam(':uuid', $_SESSION['uuid']);
-    $ticket_sql->execute();
-    $ticket_sql->setFetchMode(PDO::FETCH_ASSOC);
-    $ticket_result = $ticket_sql->fetchAll();
-    return $ticket_result;
+  function is_signed_in()
+  {
+      if (isset($_SESSION['is_signed_in'])) {
+          return true;
+      } else {
+          return false;
+      }
  }

-  function get_my_closed_requests($db) {
-    $ticket_stmt = "SELECT * FROM tickets WHERE created_by=:uuid AND status = 'Closed'";
-    $ticket_sql = $db->prepare($ticket_stmt);
-    $ticket_sql->bindParam(':uuid', $_SESSION['uuid']);
-    $ticket_sql->execute();
-    $ticket_sql->setFetchMode(PDO::FETCH_ASSOC);
-    $ticket_result = $ticket_sql->fetchAll();
-    return $ticket_result;
+  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) {
+          throw new Exception("Error in user_exists(): " . $e->getMessage());
+          die();
+      }
+      if (empty($result)) {
+          return false;
+      } else {
+          return true;
+      }
  }

-  function get_subscribed_requests($db) {
+  function get_all_users($db)
+  {
+      try {
+          $stmt = "SELECT * FROM users";
+          $sql = $db->prepare($stmt);
+          $sql->execute();
+          $sql->setFetchMode(PDO::FETCH_ASSOC);
+          $result = $sql->fetchAll();
+      } catch (PDOException $e) {
+          throw new Exception("Error in get_all_users(): " . $e->getMessage());
+          die();
+      }
+      return $result;
+  }
+
+  function get_user_name($db, $user_uuid)
+  {
+      try {
+          $stmt = "SELECT given_name, family_name FROM users WHERE uuid=:uuid";
+          $sql = $db->prepare($stmt);
+          $sql->bindParam(':uuid', $user_uuid);
+          $sql->execute();
+          $sql->setFetchMode(PDO::FETCH_ASSOC);
+          $result = $sql->fetchAll();
+          $usr = $result[0]['given_name'] . " " . $result[0]['family_name'];
+      } catch (PDOException $e) {
+          throw new Exception("Error in get_user_name(): " . $e->getMessage());
+          die();
+      }
+      return $usr;
+  }
+
+  function get_my_open_requests($db)
+  {
+      $ticket_stmt = "SELECT * FROM tickets WHERE created_by=:uuid AND status != 'Closed'";
+      $ticket_sql = $db->prepare($ticket_stmt);
+      $ticket_sql->bindParam(':uuid', $_SESSION['uuid']);
+      $ticket_sql->execute();
+      $ticket_sql->setFetchMode(PDO::FETCH_ASSOC);
+      $ticket_result = $ticket_sql->fetchAll();
+      return $ticket_result;
+  }
+
+  function get_my_closed_requests($db)
+  {
+      $ticket_stmt = "SELECT * FROM tickets WHERE created_by=:uuid AND status = 'Closed'";
+      $ticket_sql = $db->prepare($ticket_stmt);
+      $ticket_sql->bindParam(':uuid', $_SESSION['uuid']);
+      $ticket_sql->execute();
+      $ticket_sql->setFetchMode(PDO::FETCH_ASSOC);
+      $ticket_result = $ticket_sql->fetchAll();
+      return $ticket_result;
+  }
+
+  function get_subscribed_requests($db)
+  {
      $requests = array();
      $sub_tickets_stmt = "SELECT ticket_uuid FROM ticket_subscribers WHERE user_uuid=:uuid";
      $sub_tickets_sql = $db->prepare($sub_tickets_stmt);
@@ -56,96 +108,108 @@
      $sub_tickets_sql->setFetchMode(PDO::FETCH_ASSOC);
      $sub_tickets_result = $sub_tickets_sql->fetchAll();
      foreach ($sub_tickets_result as $tkt) {
-        $stmt = "SELECT * FROM tickets WHERE uuid=:uuid";
-        $sql = $db->prepare($stmt);
-        $sql->bindParam(':uuid', $tkt['ticket_uuid']);
-        $sql->execute();
-        $sql->setFetchMode(PDO::FETCH_ASSOC);
-        $result = $sql->fetchAll();
-        array_push($requests, $result[0]);
+          $stmt = "SELECT * FROM tickets WHERE uuid=:uuid";
+          $sql = $db->prepare($stmt);
+          $sql->bindParam(':uuid', $tkt['ticket_uuid']);
+          $sql->execute();
+          $sql->setFetchMode(PDO::FETCH_ASSOC);
+          $result = $sql->fetchAll();
+          array_push($requests, $result[0]);
      }
      return $requests;
  }

-  function get_open_subscribed_requests($db) {
-    $requests = array();
-    $all_subs = get_subscribed_requests($db);
-    foreach ($all_subs as $sub) {
-      if ($sub['status'] != 'Closed') {
-        array_push($requests, $sub);
+  function get_open_subscribed_requests($db)
+  {
+      $requests = array();
+      $all_subs = get_subscribed_requests($db);
+      foreach ($all_subs as $sub) {
+          if ($sub['status'] != 'Closed') {
+              array_push($requests, $sub);
+          }
      }
-    }
-    return $requests;
+      return $requests;
  }

-  function get_closed_subscribed_requests($db) {
-    $requests = array();
-    $all_subs = get_subscribed_requests($db);
-    foreach ($all_subs as $sub) {
-      if ($sub['status'] == 'Closed') {
-        array_push($requests, $sub);
+  function get_closed_subscribed_requests($db)
+  {
+      $requests = array();
+      $all_subs = get_subscribed_requests($db);
+      foreach ($all_subs as $sub) {
+          if ($sub['status'] == 'Closed') {
+              array_push($requests, $sub);
+          }
      }
-    }
-    return $requests;
+      return $requests;
  }

-  function get_request($db, $uuid) {
-    $ticket_stmt = "SELECT * FROM tickets WHERE uuid=:uuid";
-    $ticket_sql = $db->prepare($ticket_stmt);
-    $ticket_sql->bindParam(':uuid', $uuid);
-    $ticket_sql->execute();
-    $ticket_sql->setFetchMode(PDO::FETCH_ASSOC);
-    $ticket_result = $ticket_sql->fetchAll();
-    $request = $ticket_result[0];
-    return $request;
+  function get_request($db, $uuid)
+  {
+      $ticket_stmt = "SELECT * FROM tickets WHERE uuid=:uuid";
+      $ticket_sql = $db->prepare($ticket_stmt);
+      $ticket_sql->bindParam(':uuid', $uuid);
+      $ticket_sql->execute();
+      $ticket_sql->setFetchMode(PDO::FETCH_ASSOC);
+      $ticket_result = $ticket_sql->fetchAll();
+      $request = $ticket_result[0];
+      return $request;
  }


-  function get_updates($db, $request) {
-    $updates_stmt = "SELECT * FROM ticket_updates WHERE ticket=:uuid";
-    $updates_sql = $db->prepare($updates_stmt);
-    $updates_sql->bindParam(':uuid', $request['uuid']);
-    $updates_sql->execute();
-    $updates_sql->setFetchMode(PDO::FETCH_ASSOC);
-    $updates_result = $updates_sql->fetchAll();
-    return $updates_result;
+  function get_updates($db, $request)
+  {
+      $updates_stmt = "SELECT * FROM ticket_updates WHERE ticket=:uuid";
+      $updates_sql = $db->prepare($updates_stmt);
+      $updates_sql->bindParam(':uuid', $request['uuid']);
+      $updates_sql->execute();
+      $updates_sql->setFetchMode(PDO::FETCH_ASSOC);
+      $updates_result = $updates_sql->fetchAll();
+      return $updates_result;
  }

-  function get_files($db, $request) {
-    $stmt = "SELECT * FROM ticket_uploads WHERE ticket=:uuid";
-    $sql = $db->prepare($stmt);
-    $sql->bindParam(':uuid', $request['uuid']);
-    $sql->execute();
-    $sql->setFetchMode(PDO::FETCH_ASSOC);
-    $result = $sql->fetchAll();
-    return $result;
+  function get_files($db, $request)
+  {
+      $stmt = "SELECT * FROM ticket_uploads WHERE ticket=:uuid";
+      $sql = $db->prepare($stmt);
+      $sql->bindParam(':uuid', $request['uuid']);
+      $sql->execute();
+      $sql->setFetchMode(PDO::FETCH_ASSOC);
+      $result = $sql->fetchAll();
+      return $result;
  }

-  function get_single_file($db, $fileid) {
-    $stmt = "SELECT * FROM ticket_uploads WHERE id=:fileid";
-    $sql = $db->prepare($stmt);
-    $sql->bindParam(':fileid', $fileid);
-    $sql->execute();
-    $sql->setFetchMode(PDO::FETCH_ASSOC);
-    $result = $sql->fetchAll();
-    $file = $result[0];
-    return $file;
+  function get_single_file($db, $fileid)
+  {
+      $stmt = "SELECT * FROM ticket_uploads WHERE id=:fileid";
+      $sql = $db->prepare($stmt);
+      $sql->bindParam(':fileid', $fileid);
+      $sql->execute();
+      $sql->setFetchMode(PDO::FETCH_ASSOC);
+      $result = $sql->fetchAll();
+      $file = $result[0];
+      return $file;
  }

-  function get_subscribers($db, $request) {
-    $subs = array();
-    $users_stmt = "SELECT user_uuid FROM ticket_subscribers WHERE ticket_uuid=:uuid";
-    $users_sql = $db->prepare($users_stmt);
-    $users_sql->bindParam(':uuid', $request['uuid']);
-    $users_sql->execute();
-    $users_sql->setFetchMode(PDO::FETCH_ASSOC);
-    $users_result = $users_sql->fetchAll();
-    foreach ($users_result as $u) {
-      array_push($subs, $u['user_uuid']);
-    }
-    return $subs;
+  function get_subscribers($db, $request)
+  {
+      $subs = array();
+      $users_stmt = "SELECT user_uuid FROM ticket_subscribers WHERE ticket_uuid=:uuid";
+      $users_sql = $db->prepare($users_stmt);
+      $users_sql->bindParam(':uuid', $request['uuid']);
+      $users_sql->execute();
+      $users_sql->setFetchMode(PDO::FETCH_ASSOC);
+      $users_result = $users_sql->fetchAll();
+      foreach ($users_result as $u) {
+          array_push($subs, $u['user_uuid']);
+      }
+      return $subs;
  }

-  function isAuthorised($user, $authorised_users, $request) {
-    if ( in_array($user, $authorised_users) || $_SESSION['uuid'] == $request['created_by']) { return true; } else { return false; }
+  function isAuthorised($user, $authorised_users, $request)
+  {
+      if (in_array($user, $authorised_users) || $_SESSION['uuid'] == $request['created_by']) {
+          return true;
+      } else {
+          return false;
+      }
  }
--- a/app/includes/footer.php
+++ b/app/includes/footer.php
@@ -1,9 +1,10 @@
+</main>
 <footer class="footer mt-auto py-3">
  <div class="text-center text-muted">
    <?php
-      echo($_ENV['APP_NAME'] . " v" . $_ENV['APP_VERSION']);
+      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()) {
--- a/app/includes/header.php
+++ b/app/includes/header.php
@@ -10,7 +10,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <meta name="theme-color" content="#563d7c">
    <link rel="icon" type="image/png" href="/favicon.png">
-    <title><?php echo( $PAGE_TITLE ); ?></title>
+    <title><?php echo($PAGE_TITLE); ?></title>

    <!-- Bootstrap core CSS -->
    <link rel="stylesheet" href="/css/bootstrap.min.css">
@@ -19,6 +19,8 @@
  </head>

  <body class="d-flex flex-column h-100">
+    <!-- Begin page content -->
+    <main role="main" class="flex-shrink-0">
    <header>
    <!-- Fixed navbar -->
    <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
@@ -32,10 +34,14 @@
                <a class="nav-link" href="/">Home</a>
                </li>
                <li class="nav-item">
-                <a class="nav-link <?php if (!is_signed_in()) {echo(' disabled');} ?>" href="/new">New request</a>
+                <a class="nav-link <?php if (!is_signed_in()) {
+    echo(' disabled');
+} ?>" href="/new">New request</a>
                </li>
                <li class="nav-item">
-                <a class="nav-link <?php if (!is_signed_in()) {echo(' disabled');} ?>" href="/existing">Existing requests</a>
+                <a class="nav-link <?php if (!is_signed_in()) {
+    echo(' disabled');
+} ?>" href="/existing">Existing requests</a>
                </li>
            </ul>
        <div class="mt-2 mt-md-0">
--- a/app/includes/prereqs.php
+++ b/app/includes/prereqs.php
@@ -7,17 +7,27 @@ require_once __DIR__ . "/../vendor/autoload.php";
 $dotenv = Dotenv\Dotenv::createImmutable(__DIR__ . "/..");
 $dotenv->load();

+// Custom functions
+require_once __DIR__ . "/app_functions.php";
+
+// Sentry
+Sentry\init([
+  'dsn' => 'https://7c4607ed5e804d08926cc0bbc0d3fbe9@app.glitchtip.com/59',
+  'release' => get_version(),
+]);
+
 // Database auto-generation
 if (file_exists("/../includes/install.php")) {
-  return;
-  add_action('run_db_populate');
+    return;
+    add_action('run_db_populate');
 }

-function run_db_populate() {
+function run_db_populate()
+{
    // all my glorious one-time-magic.
-    include( "/../includes/install.php" );
-   // after all execution rename your file;
-   rename( "/../includes/install.php", "/../includes/install-backup.php");
+    include("/../includes/install.php");
+    // after all execution rename your file;
+    rename("/../includes/install.php", "/../includes/install-backup.php");
 }

 // Session
@@ -29,30 +39,9 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

 // OpenID Connect
 use Jumbojett\OpenIDConnectClient;
+
 $oidc = new OpenIDConnectClient($_ENV['OIDC_HOST'], $_ENV['OIDC_CLIENT_ID'], $_ENV['OIDC_CLIENT_SECRET']);
 if ($_ENV['OIDC_DISABLE_SSL'] == "true") {
-  $oidc->setVerifyHost(false);
-  $oidc->setVerifyPeer(false);
-}
-
-
-// Custom functions
-
-require_once __DIR__ . "/app_functions.php";
-
-function oidc_set_vars($sub, $uid, $fname, $lname, $email) {
-  $_SESSION['uuid'] = $sub;
-  $_SESSION['username'] = $uid;
-  $_SESSION['given_name'] = $fname;
-  $_SESSION['family_name'] = $lname;
-  $_SESSION['full_name'] = $fname . " " . $lname;
-  $_SESSION['email'] = $email;
-}
-
-function is_signed_in() {
-  if (isset($_SESSION['is_signed_in'])) {
-    return true;
-  } else {
-    return false;
-  }
+    $oidc->setVerifyHost(false);
+    $oidc->setVerifyPeer(false);
 }
--- a/app/public/actions/login.php
+++ b/app/public/actions/login.php
@@ -4,9 +4,9 @@

    // Perform the OIDC authentication
    try {
-      $oidc->authenticate();
-      $_SESSION['access_token'] = $oidc->requestClientCredentialsToken()->access_token;
-      $oidc_user = array(
+        $oidc->authenticate();
+        $_SESSION['access_token'] = $oidc->requestClientCredentialsToken()->access_token;
+        $oidc_user = array(
        'sub' => $oidc->requestUserInfo('sub'),
        'username' => $oidc->requestUserInfo('preferred_username'),
        'given_name' => $oidc->requestUserInfo('given_name'),
@@ -14,46 +14,41 @@
        'email' => $oidc->requestUserInfo('email'),
      );
    } catch (Jumbojett\OpenIDConnectClientException $e) {
-      $alert = array("danger", "Error during OpenID Connect authentication: " . $e->getMessage());
+        $alert = array("danger", "Error during OpenID Connect authentication: " . $e->getMessage());
    }

-    // Check if the user already exists
-    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)";
-        $sql = $db->prepare($stmt);
-        $sql->bindParam(':sub', $oidc_user['sub']);
-        $sql->bindParam(':username', $oidc_user['username']);
-        $sql->bindParam(':given', $oidc_user['given_name']);
-        $sql->bindParam(':family', $oidc_user['family_name']);
-        $sql->bindParam(':email', $oidc_user['email']);
-        $sql->execute();
-      } catch (Jumbojett\PDOException $e) {
-        $alert = array("danger", "Error during creation of new user record: " . $e->getMessage());
-      }
+    if (user_exists($db, $oidc_user['sub']) == false) {
+        // User doesn't already exist
+        try {
+            $stmt = "INSERT INTO users (uuid, uid, given_name, family_name, email) VALUES (:sub, :username, :given, :family, :email)";
+            $sql = $db->prepare($stmt);
+            $sql->bindParam(':sub', $oidc_user['sub']);
+            $sql->bindParam(':username', $oidc_user['username']);
+            $sql->bindParam(':given', $oidc_user['given_name']);
+            $sql->bindParam(':family', $oidc_user['family_name']);
+            $sql->bindParam(':email', $oidc_user['email']);
+            $sql->execute();
+        } 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 {
-      // User already exists
-      try {
-        $stmt = "UPDATE users SET uid=:username, given_name=:given, family_name=:family, email=:email WHERE uuid=:sub";
-        $sql = $db->prepare($stmt);
-        $sql->bindParam(':sub', $oidc_user['sub']);
-        $sql->bindParam(':username', $oidc_user['username']);
-        $sql->bindParam(':given', $oidc_user['given_name']);
-        $sql->bindParam(':family', $oidc_user['family_name']);
-        $sql->bindParam(':email', $oidc_user['email']);
-        $sql->execute();
-      } catch (Jumbojett\PDOException $e) {
-        $alert = array("danger", "Error during existing user record update: " . $e->getMessage());
-      }
+        // User already exists
+        try {
+            $stmt = "UPDATE users SET uid=:username, given_name=:given, family_name=:family, email=:email WHERE uuid=:sub";
+            $sql = $db->prepare($stmt);
+            $sql->bindParam(':sub', $oidc_user['sub']);
+            $sql->bindParam(':username', $oidc_user['username']);
+            $sql->bindParam(':given', $oidc_user['given_name']);
+            $sql->bindParam(':family', $oidc_user['family_name']);
+            $sql->bindParam(':email', $oidc_user['email']);
+            $sql->execute();
+        } catch (PDOException $e) {
+            echo("Error during existing user record update: " . $e->getMessage());
+            die();
+            $alert = array("danger", "Error during existing user record update: " . $e->getMessage());
+        }
    }

    oidc_set_vars($oidc_user['sub'], $oidc_user['username'], $oidc_user['given_name'], $oidc_user['family_name'], $oidc_user['email']);
@@ -62,4 +57,3 @@
    $_SESSION['is_signed_in'] = "true";

    header('Location: /');
-?>
--- a/app/public/index.php
+++ b/app/public/index.php
@@ -3,21 +3,17 @@
    require_once __DIR__ . "/../includes/header.php";

    if (is_signed_in()) {
-      $requests = get_my_open_requests($db);
-      $subscriptions = get_open_subscribed_requests($db);
+        $requests = get_my_open_requests($db);
+        $subscriptions = get_open_subscribed_requests($db);
    }

 ?>


-
-<!-- Begin page content -->
-<main role="main" class="flex-shrink-0">
-
  <section>
    <?php
-      if(isset($alert)) {
-        echo("
+      if (isset($alert)) {
+          echo("
        <div class='container'>
          <div class='alert alert-" . $alert[0] . " alert-dismissible fade show' role='alert'>
            " . $alert[1] . "
@@ -27,7 +23,7 @@
          </div>
        </div>
      ");
-      unset($alert);
+          unset($alert);
      }
    ?>
  </section>
@@ -37,7 +33,11 @@
      <h1>Welcome to <?php echo($_ENV['APP_NAME']); ?></h1>
      <p class="lead text-muted">
        <?php
-          if ($_ENV['APP_NAME'] == "FHeD") {echo("The Free HelpDesk");} else {echo($_ENV['APP_NAME']);};
+          if ($_ENV['APP_NAME'] == "FHeD") {
+              echo("The Free HelpDesk");
+          } else {
+              echo($_ENV['APP_NAME']);
+          };
        ?>
        is the one-stop shop for all of your IT-related needs. Let us know how we can help you by opening a request.
      </p>
@@ -63,10 +63,10 @@
            <ul class="list-group list-group-flush">
              <?php
                if (count($requests) == 0) {
-                  echo("<center><b>No open tickets</b></center>");
+                    echo("<center><b>No open tickets</b></center>");
                } else {
-                  foreach($requests as $tkt) {
-              ?>
+                    foreach ($requests as $tkt) {
+                        ?>
              <li class="list-group-item">
                <div class="container">
                  <div class="row">
@@ -80,7 +80,9 @@
                  </div>
                </div>
              </li>
-              <?php } } ?>
+              <?php
+                    }
+                } ?>
            </ul>
          </div>
        </div>
@@ -93,9 +95,9 @@
            <ul class="list-group list-group-flush">
              <?php
                if (count($subscriptions) == 0) {
-                  echo("<center><b>No subscribed tickets</b></center>");
+                    echo("<center><b>No subscribed tickets</b></center>");
                } else {
-                  foreach($subscriptions as $sub) { ?>
+                    foreach ($subscriptions as $sub) { ?>
              <li class="list-group-item">
                <div class="container">
                  <div class="row">
@@ -109,7 +111,8 @@
                  </div>
                </div>
              </li>
-              <?php } } ?>
+              <?php }
+                } ?>
            </ul>
          </div>
        </section>
@@ -118,8 +121,6 @@
    </div>
  <?php } ?>

-</main>
-
 <?php
    require_once __DIR__ . "/../includes/footer.php";
 ?>
Author	SHA1	Message	Date
renovate[bot]	4bced68a09	Update dependency sentry/sdk to v3 (#138 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2020-09-28 19:26:51 +01:00
Alexander Davis	4d3ace9d67	Update deploy.yml (#137 )	2020-09-08 22:16:27 +01:00
restyled-io[bot]	e9f1b8477a	Restyle Updates (#135 ) * Restyled by jq * Restyled by php-cs-fixer * Restyled by whitespace Co-authored-by: Restyled.io <commits@restyled.io>	2020-09-05 16:43:48 +01:00
Luke Tainton	9809b028d4	🐛 Move opening and closing 'main' tags (#132 ) * 🐛 Move opening and closing 'main' tags Signed-off-by: Luke Tainton <luke@tainton.uk> * Restyled by php-cs-fixer (#133) Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com> Co-authored-by: Restyled.io <commits@restyled.io>	2020-08-31 19:16:33 +01:00
Luke Tainton	da5d7ffa53	🚧 Migrate from Sentry to GlitchTip (#129 ) Signed-off-by: Luke Tainton <luke@tainton.uk>	2020-08-18 20:14:08 +01:00
Luke Tainton	02c397bca2	✨ Add Sentry (#127 ) Signed-off-by: Luke Tainton <luke@tainton.uk>	2020-08-18 18:32:29 +01:00
Luke Tainton	a4ae987f94	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>	2020-08-18 17:58:07 +01:00
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
Alexander Davis	57faf21a67	Fixing Login Die	2020-08-17 16:37:41 +01:00
Luke Tainton	5ff90e0d78	🐛 User not added to DB - force die() on error (#118 ) * 🐛 User not added to DB - force die() on error Signed-off-by: Luke Tainton <luke@tainton.uk> * Restyled by php-cs-fixer (#119) Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com> Co-authored-by: Restyled.io <commits@restyled.io>	2020-08-17 16:17:06 +01:00
Luke Tainton	7a4a1074c5	🔧 Push release version to Docker image (#114 ) * 🔧 Push release version to Docker image Signed-off-by: Luke Tainton <luke@tainton.uk> * Restyle 🔧 Push release version to Docker image (#115) * Restyled by php-cs-fixer * Restyled by whitespace Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com> Co-authored-by: Restyled.io <commits@restyled.io>	2020-08-17 12:03:32 +01:00
Luke Tainton	c8576aa757	🐛 Make it plural! (#113 )	2020-08-17 11:45:28 +01:00