Added is agent check into agent homepage

No checks to to see if user is agent or not.

Dockerfile

@@ -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

app/.env.sample

@@ -13,3 +13,5 @@ OIDC_HOST          = ""
 OIDC_CLIENT_ID     = ""
 OIDC_CLIENT_SECRET = ""
 OIDC_DISABLE_SSL   = ""
+
+SENTRY_ENVIRONMENT = ""

app/composer.json

@@ -2,6 +2,7 @@
     "require": {
         "ramsey/uuid": "^4.0",
         "vlucas/phpdotenv": "^5.0",
-        "jumbojett/openid-connect-php": "^0.9.0"
+        "jumbojett/openid-connect-php": "^0.9.0",
+        "sentry/sdk": "^2.1"
     }
 }

app/includes/app_functions.php

@@ -1,5 +1,61 @@
 <?php
-  function get_all_users($db) {
+
+  function get_version()
+  {
+      $version = "v" . file_get_contents(__DIR__ . '/VERSION');
+      return $version;
+  }
+
+  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;
+    }
+  }
+
+  function is_agent()
+  {
+    // Some SQL commands go here
+    if ($agent_result) {
+       return true;
+    } else {
+       return false;
+    }
+  }
+
+  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_all_users($db)
+  {
       try {
           $stmt = "SELECT * FROM users";
           $sql = $db->prepare($stmt);
@@ -7,12 +63,14 @@
           $sql->setFetchMode(PDO::FETCH_ASSOC);
           $result = $sql->fetchAll();
       } catch (PDOException $e) {
-      echo("Error: " . $e->getMessage());
+          throw new Exception("Error in get_all_users(): " . $e->getMessage());
+          die();
       }
       return $result;
   }
 
-  function get_user_name($db, $user_uuid) {
+  function get_user_name($db, $user_uuid)
+  {
       try {
           $stmt = "SELECT given_name, family_name FROM users WHERE uuid=:uuid";
           $sql = $db->prepare($stmt);
@@ -22,12 +80,14 @@
           $result = $sql->fetchAll();
           $usr = $result[0]['given_name'] . " " . $result[0]['family_name'];
       } catch (PDOException $e) {
-      echo("Error: " . $e->getMessage());
+          throw new Exception("Error in get_user_name(): " . $e->getMessage());
+          die();
       }
       return $usr;
   }
 
-  function get_my_open_requests($db) {
+  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']);
@@ -37,7 +97,8 @@
       return $ticket_result;
   }
 
-  function get_my_closed_requests($db) {
+  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']);
@@ -47,7 +108,8 @@
       return $ticket_result;
   }
 
-  function get_subscribed_requests($db) {
+  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);
@@ -67,7 +129,8 @@
       return $requests;
   }
 
-  function get_open_subscribed_requests($db) {
+  function get_open_subscribed_requests($db)
+  {
       $requests = array();
       $all_subs = get_subscribed_requests($db);
       foreach ($all_subs as $sub) {
@@ -78,7 +141,8 @@
       return $requests;
   }
 
-  function get_closed_subscribed_requests($db) {
+  function get_closed_subscribed_requests($db)
+  {
       $requests = array();
       $all_subs = get_subscribed_requests($db);
       foreach ($all_subs as $sub) {
@@ -89,7 +153,8 @@
       return $requests;
   }
 
-  function get_request($db, $uuid) {
+  function get_request($db, $uuid)
+  {
       $ticket_stmt = "SELECT * FROM tickets WHERE uuid=:uuid";
       $ticket_sql = $db->prepare($ticket_stmt);
       $ticket_sql->bindParam(':uuid', $uuid);
@@ -101,7 +166,8 @@
   }
 
 
-  function get_updates($db, $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']);
@@ -111,7 +177,8 @@
       return $updates_result;
   }
 
-  function get_files($db, $request) {
+  function get_files($db, $request)
+  {
       $stmt = "SELECT * FROM ticket_uploads WHERE ticket=:uuid";
       $sql = $db->prepare($stmt);
       $sql->bindParam(':uuid', $request['uuid']);
@@ -121,7 +188,8 @@
       return $result;
   }
 
-  function get_single_file($db, $fileid) {
+  function get_single_file($db, $fileid)
+  {
       $stmt = "SELECT * FROM ticket_uploads WHERE id=:fileid";
       $sql = $db->prepare($stmt);
       $sql->bindParam(':fileid', $fileid);
@@ -132,7 +200,8 @@
       return $file;
   }
 
-  function get_subscribers($db, $request) {
+  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);
@@ -146,6 +215,11 @@
       return $subs;
   }
 
-  function isAuthorised($user, $authorised_users, $request) {
+  function isAuthorised($user, $authorised_users, $request)
-    if ( in_array($user, $authorised_users) || $_SESSION['uuid'] == $request['created_by']) { return true; } else { return false; }
+  {
+      if (in_array($user, $authorised_users) || $_SESSION['uuid'] == $request['created_by']) {
+          return true;
+      } else {
+          return false;
+      }
   }

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()) {

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">

app/includes/prereqs.php

@@ -7,6 +7,15 @@ 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;
@@ -34,25 +43,3 @@ 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;
-  }
-}

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: /');
-?>

app/public/agent/editsub.php

@@ -0,0 +1,173 @@
+<?php
+    $PAGE_NAME = "Manage Subscribers";
+    require_once __DIR__ . "/../../includes/header.php";
+
+    $request = get_request($db, $_GET['rid']);
+    $authorised_users = get_subscribers($db, $request);
+    if ($_SESSION['uuid'] == $request['created_by']) {
+      $is_authorised = true;
+    } else {
+      $is_authorised = false;
+    };
+
+    $all_users = get_all_users($db);
+
+    function get_req_subs($db, $uuid) {
+      $stmt = "SELECT * FROM ticket_subscribers WHERE ticket_uuid=:uuid";
+      $sql = $db->prepare($stmt);
+      $sql->bindParam(':uuid', $uuid);
+      $sql->execute();
+      $sql->setFetchMode(PDO::FETCH_ASSOC);
+      $result = $sql->fetchAll();
+      return $result;
+    }
+
+    $subs = get_req_subs($db, $request['uuid'])
+?>
+
+
+
+<!-- Begin page content -->
+<main role="main" class="flex-shrink-0">
+
+  <?php if (!is_signed_in()) { ?>
+    <section>
+      <div class="container">
+        <div class='alert alert-danger alert-dismissible fade show' role='alert'>
+          You need to log in to access this page.
+          <button type='button' class='close' data-dismiss='alert' aria-label='Close'>
+            <span aria-hidden='true'>&times;</span>
+          </button>
+        </div>
+      </div>
+    </section>
+  <?php } else {
+      if ($is_authorised == true) { ?>
+      <section class="jumbotron text-center">
+        <div class="container">
+          <h1><?php echo($request['title']); ?></h1>
+          <p class="ticketid"><?php echo("#" . sprintf("%'.05d\n", $request["id"])); ?></p>
+          <p class="lead text-muted"><?php echo($request['description']); ?></p>
+        </div>
+      </section>
+      <section>
+        <div class="container">
+          <div class="row">
+            <div class="col-4">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-information-outline">
+                  </span> Information
+                </div>
+                <ul class="list-group list-group-flush">
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Status:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['status']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Created by:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo(get_user_name($db, $request['created_by'])); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Assigned to:</b></span>
+                        <?php if ($request['assignee'] != null) {
+                          echo("<span style='display: inline; margin-left: 1%;'>" . get_user_name($db, $request['assignee']) . "</span>");
+                        } else {
+                          echo("<span class='text-muted' style='display: inline; margin-left: 1%;'>None</span>");
+                        } ?>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Created:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['created_on']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Last updated:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['last_updated']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </div>
+            </div>
+
+            <div class="col-8">
+              <div class="card mx-auto">
+                <div class="card-header">
+                  <span class="mdi mdi-rss"></span> Manage Subscribers
+                </div>
+                <ul class="list-group list-group-flush">
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <form method="post" action="/actions/delsub">
+                          <div class="form-group">
+                            <input type="hidden" id="rid" name="rid" value="<?php echo($request['uuid']); ?>">
+                            <label for="delSubSelector">Remove subscribers:</label>
+                            <select multiple class="form-control" id="delSubSelector" name="delSubSelector[]">
+                              <?php foreach($subs as $sub) {
+                                  echo("<option value='" . $sub['sub_id'] . "'>" . get_user_name($db, $sub['user_uuid']) . "</option>");
+                                } ?>
+                            </select>
+                          </div>
+                          <button type="submit" class="btn btn-danger">Submit</button>
+                        </form>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <form method="post" action="/actions/addsub">
+                          <div class="form-group">
+                            <input type="hidden" id="rid" name="rid" value="<?php echo($request['uuid']); ?>">
+                            <label for="addSubSelector">Add subscriber:</label>
+                            <select class="form-control" id="addSubSelector" name="addSubSelector">
+                              <?php foreach($all_users as $usr) {
+                                if (!in_array($usr['uuid'], $authorised_users) && $usr['uuid'] != $request['created_by'] && $usr['uid'] != "system") {
+                                  echo("<option value='" . $usr['uuid'] . "'>" . get_user_name($db, $usr['uuid']) . "</option>");
+                                }
+                              } ?>
+                            </select>
+                          </div>
+                          <button type="submit" class="btn btn-primary">Submit</button>
+                        </form>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </section>
+
+    <?php } else if ($is_authorised == false) { ?>
+      <section class="jumbotron text-center">
+        <div class="container">
+          <h1>You are not authorised to see this page.</h1>
+        </div>
+      </section>
+    <?php } } ?>
+
+</main>
+
+<?php
+    require_once __DIR__ . "/../includes/footer.php";
+?>

app/public/agent/existing.php

@@ -0,0 +1,105 @@
+<?php
+    $PAGE_NAME = "Existing requests";
+    require_once __DIR__ . "/../../includes/header.php";
+
+    if (is_signed_in()) {
+      $open_requests = get_all_open_requests($db);
+      $closed_requests = get_all_closed_requests($db);
+    }
+?>
+
+
+
+<!-- Begin page content -->
+<main role="main" class="flex-shrink-0">
+
+  <section class="jumbotron text-center">
+    <div class="container">
+      <h1>Existing requests</h1>
+      <p class="lead text-muted">
+        Here you can find all of your requests, and other requests that you are subscribed to.
+      </p>
+    </div>
+  </section>
+  <?php if (is_signed_in()) { ?>
+    <section>
+      <div class="card mx-auto" style="width: 80%;margin-bottom: 50px;">
+        <div class="card-header">
+          <span class="mdi mdi-ticket-outline"></span> My Requests
+        </div>
+        <nav>
+          <div class="nav nav-tabs" id="my-tab" role="tablist">
+            <a id="nav-my-open-tab" class="nav-link active" data-toggle="tab" role="tab" aria-selected="false" href="#my-open" aria-controls="nav-my-open">Open</a>
+            <a id="nav-my-closed-tab" class="nav-link" data-toggle="tab" role="tab" aria-selected="true" href="#my-closed" aria-controls="nav-my-closed">Closed</a>
+          </div>
+        </nav>
+        <div class="tab-content" id="my-tabContent">
+          <!-- Open requests content -->
+          <div id="my-open" class="tab-pane fade active show" role="tabpanel" aria-labelledby="nav-my-open">
+             <ul class="list-group list-group-flush">
+               <?php
+                 if (count($open_requests) == 0) {
+                   echo("<center><b>No open tickets</b></center>");
+                 } else {
+                   foreach($open_requests as $tkt) {
+               ?>
+               <li class="list-group-item">
+                 <div class="container">
+                   <div class="row">
+                     <div class="col-10">
+                       <span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span>
+                       <span><b><?php echo($tkt['title']); ?></b></span>
+                       <p class="m-0"><?php echo($tkt['description']); ?></p>
+                     </div>
+                     <div class="col-2">
+                       <a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
+                     </div>
+                   </div>
+                 </div>
+               </li>
+               <?php } } ?>
+             </ul>
+            </div>
+            <!-- Closed requests content -->
+            <div id="my-closed" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-my-closed">
+              <ul class="list-group list-group-flush">
+                <?php
+                if (count($closed_requests) == 0) {
+                  echo("<center><b>No closed tickets</b></center>");
+                } else {
+                  foreach($closed_requests as $tkt) {
+                    ?>
+                    <li class="list-group-item">
+                      <div class="container">
+                        <div class="row">
+                          <div class="col-10">
+                            <span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span><span><b><?php echo($tkt['title']); ?></b></span>
+                            <p class="m-0"><?php echo($tkt['description']); ?></p>
+                          </div>
+                          <div class="col-2">
+                            <a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                  <?php } } ?>
+                </ul>
+              </div>
+        </div>
+      </div>
+    </section>
+    <?php } else { ?>
+      <section>
+        <div class='alert alert-danger alert-dismissible fade show' role='alert'>
+          You need to log in to access this page.
+          <button type='button' class='close' data-dismiss='alert' aria-label='Close'>
+            <span aria-hidden='true'>&times;</span>
+          </button>
+        </div>
+      </section>
+    <?php } ?>
+</main>
+
+<?php
+    require_once __DIR__ . "/../includes/footer.php";
+?>

app/public/agent/index.php

@@ -0,0 +1,95 @@
+<?php
+    $PAGE_NAME = "Agent Home";
+    require_once __DIR__ . "/../../includes/header.php";
+
+    if (is_signed_in()) {
+        $requests = get_my_assigned_requests($db);
+    }
+
+?>
+
+
+  <section>
+    <?php
+      if (isset($alert)) {
+          echo("
+        <div class='container'>
+          <div class='alert alert-" . $alert[0] . " alert-dismissible fade show' role='alert'>
+            " . $alert[1] . "
+            <button type='button' class='close' data-dismiss='alert' aria-label='Close'>
+              <span aria-hidden='true'>&times;</span>
+            </button>
+          </div>
+        </div>
+      ");
+          unset($alert);
+      }
+    ?>
+  </section>
+  <?php if (is_agent) { ?>
+  <section class="jumbotron text-center">
+      <div class="container">
+        <h1>Welcome to <?php echo($_ENV['APP_NAME']); ?> Agent Area</h1>
+        <p class="lead text-muted">
+          Under construction
+        </p>
+        <?php if (is_signed_in()) { ?>
+          <p>
+            <a href='/open' class='btn btn-primary my-2'>View open requests</a>
+            <a href='/existing' class='btn btn-secondary my-2'>View all requests</a>
+          </p>
+        <?php } else { ?>
+          <p><b>Please log in to view requests.</b></p>
+        <?php } ?>
+      </div>
+    </section>
+
+  <?php if (is_signed_in()) { ?>
+    <div class="container" style="margin-top: -5%">
+      <div class="row">
+        <div class="col-sm">
+          <div class="card mx-auto">
+            <div class="card-header">
+              <span class="mdi mdi-ticket-outline"></span> My Open Requests
+            </div>
+            <ul class="list-group list-group-flush">
+              <?php
+                if (count($requests) == 0) {
+                    echo("<center><b>No open tickets</b></center>");
+                } else {
+                    foreach ($requests as $tkt) {
+                        ?>
+              <li class="list-group-item">
+                <div class="container">
+                  <div class="row">
+                    <div class="col-10">
+                      <span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span><span><b><?php echo($tkt['title']); ?></b></span>
+                      <p class="m-0"><?php echo($tkt['description']); ?></p>
+                    </div>
+                    <div class="col-2">
+                      <a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
+                    </div>
+                  </div>
+                </div>
+              </li>
+              <?php
+                    }
+                } ?>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  <?php } ?>
+<?php } else { ?>
+  <div class="container">
+    <h1>Access Denied</h1>
+    <p class="lead text-muted">
+      You do not have permission to access this area.
+    </p>
+  </div>
+<?php } ?>
+
+<?php
+    require_once __DIR__ . "/../includes/footer.php";
+?>

app/public/agent/open.php

@@ -0,0 +1,69 @@
+<?php
+    $PAGE_NAME = "Existing requests";
+    require_once __DIR__ . "/../../includes/header.php";
+
+    if (is_signed_in()) {
+      $open_requests = get_all_open_requests($db);
+    }
+?>
+
+
+
+<!-- Begin page content -->
+<main role="main" class="flex-shrink-0">
+
+  <section class="jumbotron text-center">
+    <div class="container">
+      <h1>Existing requests</h1>
+      <p class="lead text-muted">
+        Here you can find all of your requests, and other requests that you are subscribed to.
+      </p>
+    </div>
+  </section>
+  <?php if (is_signed_in()) { ?>
+    <section>
+      <div class="card mx-auto" style="width: 80%;margin-bottom: 50px;">
+        <div class="card-header">
+          <span class="mdi mdi-ticket-outline"></span> My Requests
+        </div>
+             <ul class="list-group list-group-flush">
+               <?php
+                 if (count($open_requests) == 0) {
+                   echo("<center><b>No open tickets</b></center>");
+                 } else {
+                   foreach($open_requests as $tkt) {
+               ?>
+               <li class="list-group-item">
+                 <div class="container">
+                   <div class="row">
+                     <div class="col-10">
+                       <span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span>
+                       <span><b><?php echo($tkt['title']); ?></b></span>
+                       <p class="m-0"><?php echo($tkt['description']); ?></p>
+                     </div>
+                     <div class="col-2">
+                       <a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
+                     </div>
+                   </div>
+                 </div>
+               </li>
+               <?php } } ?>
+             </ul>
+            </div>
+      </div>
+    </section>
+    <?php } else { ?>
+      <section>
+        <div class='alert alert-danger alert-dismissible fade show' role='alert'>
+          You need to log in to access this page.
+          <button type='button' class='close' data-dismiss='alert' aria-label='Close'>
+            <span aria-hidden='true'>&times;</span>
+          </button>
+        </div>
+      </section>
+    <?php } ?>
+</main>
+
+<?php
+    require_once __DIR__ . "/../includes/footer.php";
+?>

app/public/agent/update.php

@@ -0,0 +1,155 @@
+<?php
+    $PAGE_NAME = "Update Request";
+    require_once __DIR__ . "/../../includes/header.php";
+
+    $request = get_request($db, $_GET['rid']);
+    $updates = get_updates($db, $request);
+    $authorised_users = get_subscribers($db, $request);
+    $is_authorised = isAuthorised($_SESSION['uuid'], $authorised_users, $request);
+?>
+
+
+
+<!-- Begin page content -->
+<main role="main" class="flex-shrink-0">
+
+  <?php if (!is_signed_in()) { ?>
+    <section>
+      <div class="container">
+        <div class='alert alert-danger alert-dismissible fade show' role='alert'>
+          You need to log in to access this page.
+          <button type='button' class='close' data-dismiss='alert' aria-label='Close'>
+            <span aria-hidden='true'>&times;</span>
+          </button>
+        </div>
+      </div>
+    </section>
+  <?php } else {
+      if ($is_authorised == true) { ?>
+      <section class="jumbotron text-center">
+        <div class="container">
+          <h1><?php echo($request['title']); ?></h1>
+          <p style="color: gray; font-style: italic;"><?php echo("#" . sprintf("%'.05d\n", $request["id"])); ?></p>
+          <p class="lead text-muted"><?php echo($request['description']); ?></p>
+        </div>
+      </section>
+      <section>
+        <div class="container">
+          <div class="row">
+            <div class="col-4">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-information-outline"></span> Information</div>
+                <ul class="list-group list-group-flush">
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Status:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['status']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Created by:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo(get_user_name($db, $request['created_by'])); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Assigned to:</b></span>
+                        <?php if ($request['assignee'] != null) {
+                          echo("<span style='display: inline; margin-left: 1%;'>" . get_user_name($db, $request['assignee']) . "</span>");
+                        } else {
+                          echo("<span class='text-muted' style='display: inline; margin-left: 1%;'>None</span>");
+                        } ?>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Created:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['created_on']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Last updated:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['last_updated']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </div>
+            </div>
+
+            <div class="col-8">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-update"></span> Updates</div>
+                <ul class="list-group list-group-flush">
+                  <?php
+                    if (count($updates) == 0) {
+                      echo("<center><b>No updates</b></center>");
+                    } else {
+                      foreach($updates as $update) {
+                  ?>
+                    <li class="list-group-item">
+                      <div class="container">
+                        <div class="row">
+                          <span class="requestinfo"><b><?php echo(get_user_name($db, $update['user'])); ?></b></span>
+                          <span class="requestinfo-spaced text-muted"><i><?php echo($update['created']); ?></i></span>
+                        </div>
+                        <div class="row">
+                          <span><?php echo(filter_var($update['msg'], FILTER_SANITIZE_STRING)); ?></span>
+                        </div>
+                      </div>
+                    </li>
+                  <?php } } ?>
+                </ul>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </section>
+
+      <section style="margin-top: 2%;">
+        <div class="container">
+          <div class="row">
+            <div class="col-12">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-send-outline"></span> Post update</div>
+                  <form action="/actions/update" method="post" enctype="multipart/form-data">
+                    <div class="form-group">
+                      <input type="hidden" id="rid" name="rid" value="<?php echo($request['uuid']); ?>">
+                    </div>
+                    <div class="form-group" style="margin: 2%;">
+                      <textarea type="text" class="form-control" id="msg" name="msg" rows="3"></textarea>
+                      <button type="submit" class="btn btn-primary" style="margin-top: 2%;">Submit</button>
+                      <a href="/view?rid=<?php echo($_GET['rid']); ?>" class="btn btn-danger" style="margin-top: 2%;">Cancel</a>
+                    </div>
+                  </form>
+              </div>
+            </div>
+          </div>
+        </div>
+      </section>
+
+    <?php } else if ($is_authorised == false) { ?>
+      <section class="jumbotron text-center">
+        <div class="container">
+          <h1>You are not authorised to see this page.</h1>
+        </div>
+      </section>
+    <?php } } ?>
+
+</main>
+
+<?php
+    require_once __DIR__ . "/../includes/footer.php";
+?>

app/public/agent/upload.php

@@ -0,0 +1,155 @@
+<?php
+    $PAGE_NAME = "Upload file";
+    require_once __DIR__ . "/../../includes/header.php";
+
+    $request = get_request($db, $_GET['rid']);
+    $updates = get_updates($db, $request);
+    $authorised_users = get_subscribers($db, $request);
+    $is_authorised = isAuthorised($_SESSION['uuid'], $authorised_users, $request);
+?>
+
+
+
+<!-- Begin page content -->
+<main role="main" class="flex-shrink-0">
+
+  <?php if (!is_signed_in()) { ?>
+    <section>
+      <div class="container">
+        <div class='alert alert-danger alert-dismissible fade show' role='alert'>
+          You need to log in to access this page.
+          <button type='button' class='close' data-dismiss='alert' aria-label='Close'>
+            <span aria-hidden='true'>&times;</span>
+          </button>
+        </div>
+      </div>
+    </section>
+  <?php } else {
+      if ($is_authorised == true) { ?>
+      <section class="jumbotron text-center">
+        <div class="container">
+          <h1><?php echo($request['title']); ?></h1>
+          <p style="color: gray; font-style: italic;"><?php echo("#" . sprintf("%'.05d\n", $request["id"])); ?></p>
+          <p class="lead text-muted"><?php echo($request['description']); ?></p>
+        </div>
+      </section>
+      <section>
+        <div class="container">
+          <div class="row">
+            <div class="col-4">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-information-outline"></span> Information</div>
+                <ul class="list-group list-group-flush">
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Status:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['status']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Created by:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo(get_user_name($db, $request['created_by'])); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Assigned to:</b></span>
+                        <?php if ($request['assignee'] != null) {
+                          echo("<span style='display: inline; margin-left: 1%;'>" . get_user_name($db, $request['assignee']) . "</span>");
+                        } else {
+                          echo("<span class='text-muted' style='display: inline; margin-left: 1%;'>None</span>");
+                        } ?>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Created:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['created_on']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Last updated:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['last_updated']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </div>
+            </div>
+
+            <div class="col-8">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-update"></span> Updates</div>
+                <ul class="list-group list-group-flush">
+                  <?php
+                    if (count($updates) == 0) {
+                      echo("<center><b>No updates</b></center>");
+                    } else {
+                      foreach($updates as $update) {
+                  ?>
+                    <li class="list-group-item">
+                      <div class="container">
+                        <div class="row">
+                          <span class="requestinfo"><b><?php echo(get_user_name($db, $update['user'])); ?></b></span>
+                          <span class="requestinfo-spaced text-muted"><i><?php echo($update['created']); ?></i></span>
+                        </div>
+                        <div class="row">
+                          <span><?php echo(filter_var($update['msg'], FILTER_SANITIZE_STRING)); ?></span>
+                        </div>
+                      </div>
+                    </li>
+                  <?php } } ?>
+                </ul>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </section>
+
+      <section style="margin-top: 2%;">
+        <div class="container">
+          <div class="row">
+            <div class="col-12">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-cloud-upload-outline"></span> Upload file(s)</div>
+                  <form action="/actions/upload" method="post" enctype="multipart/form-data">
+                    <div class="form-group">
+                      <input type="hidden" id="rid" name="rid" value="<?php echo($request['uuid']); ?>">
+                    </div>
+                    <div class="form-group" style="margin: 2%;">
+                      <input type="file" class="form-control-file" id="file" name="file">
+                      <button type="submit" class="btn btn-primary" style="margin-top: 2%;">Submit</button>
+                      <a href="/view?rid=<?php echo($_GET['rid']); ?>" class="btn btn-danger" style="margin-top: 2%;">Cancel</a>
+                    </div>
+                  </form>
+              </div>
+            </div>
+          </div>
+        </div>
+      </section>
+
+    <?php } else if ($is_authorised == false) { ?>
+      <section class="jumbotron text-center">
+        <div class="container">
+          <h1>You are not authorised to see this page.</h1>
+        </div>
+      </section>
+    <?php } } ?>
+
+</main>
+
+<?php
+    require_once __DIR__ . "/../includes/footer.php";
+?>

app/public/agent/view.php

@@ -0,0 +1,209 @@
+<?php
+    $PAGE_NAME = "View Request";
+    require_once __DIR__ . "/../../includes/header.php";
+
+    $request = get_request($db, $_GET['rid']);
+    $updates = get_updates($db, $request);
+    $files = get_files($db, $request);
+    $authorised_users = get_subscribers($db, $request);
+    $is_authorised = isAuthorised($_SESSION['uuid'], $authorised_users, $request);
+?>
+
+
+
+<!-- Begin page content -->
+<main role="main" class="flex-shrink-0">
+
+  <section>
+    <?php
+      if(isset($alert)) {
+        echo("
+        <div class='container'>
+          <div class='alert alert-" . $alert[0] . " alert-dismissible fade show' role='alert'>
+            " . $alert[1] . "
+            <button type='button' class='close' data-dismiss='alert' aria-label='Close'>
+              <span aria-hidden='true'>&times;</span>
+            </button>
+          </div>
+        </div>
+      ");
+      unset($alert);
+      }
+    ?>
+  </section>
+
+  <?php if (!is_signed_in()) { ?>
+    <section>
+      <div class="container">
+        <div class='alert alert-danger alert-dismissible fade show' role='alert'>
+          You need to log in to access this page.
+          <button type='button' class='close' data-dismiss='alert' aria-label='Close'>
+            <span aria-hidden='true'>&times;</span>
+          </button>
+        </div>
+      </div>
+    </section>
+  <?php } else {
+      if ($is_authorised == true) { ?>
+      <section class="jumbotron text-center">
+        <div class="container-fluid">
+          <h1><?php echo($request['title']); ?></h1>
+          <p class="ticketid"><?php echo("#" . sprintf("%'.05d\n", $request["id"])); ?></p>
+          <p class="lead text-muted"><?php echo($request['description']); ?></p>
+            <p>
+              <?php if ($request['status'] != 'Closed') { ?>
+                <a href='/update?rid=<?php echo($request["uuid"]); ?>' class='btn btn-primary my-2'>Update the request</a>
+                <a href='/upload?rid=<?php echo($request["uuid"]); ?>' class='btn btn-primary my-2'>Add attachment(s)</a>
+                <?php if ($_SESSION['uuid'] == $request['created_by']) { ?>
+                  <a href='/editsub?rid=<?php echo($request["uuid"]); ?>' class='btn btn-secondary my-2'>Manage subscribers</a>
+                  <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#closeModal">Close the request</button>
+                  <div class="modal fade" id="closeModal" tabindex="-1" aria-labelledby="closeModalLabel" aria-hidden="true">
+                    <div class="modal-dialog">
+                      <div class="modal-content">
+                        <div class="modal-header">
+                          <h5 class="modal-title" id="closeModalLabel">Close the request?</h5>
+                          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                          </button>
+                        </div>
+                        <div class="modal-body">
+                          Are you sure you want to close request <b><?php echo($request['title']); ?></b>? This action is irreversible.
+                        </div>
+                        <div class="modal-footer">
+                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                          <a href='/actions/close?rid=<?php echo($request["uuid"]); ?>' class='btn btn-danger'>Close request</a>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                <?php } ?>
+              <?php } elseif ($request['status'] == 'Closed') { ?>
+                <?php if ($_SESSION['uuid'] == $request['created_by']) { ?>
+                  <a href='/actions/reopen?rid=<?php echo($request["uuid"]); ?>' class='btn btn-success my-2'>Reopen request</a>
+                <?php } } ?>
+            </p>
+        </div>
+      </section>
+      <section>
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-3">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-information-outline"></span> Information</div>
+                <ul class="list-group list-group-flush">
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Status:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['status']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Created by:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo(get_user_name($db, $request['created_by'])); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Assigned to:</b></span>
+                        <?php if ($request['assignee'] != null) {
+                          echo("<span class='requestinfo requestinfo-spaced'>" . get_user_name($db, $request['assignee']) . "</span>");
+                        } else {
+                          echo("<span class='requestinfo requestinfo-spaced text-muted'>None</span>");
+                        } ?>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Created:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['created_on']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                  <li class="list-group-item">
+                    <div class="container">
+                      <div class="row">
+                        <span class="requestinfo"><b>Last updated:</b></span>
+                        <span class="requestinfo requestinfo-spaced"><?php echo($request['last_updated']); ?></span>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </div>
+            </div>
+
+            <div class="col-3">
+              <div class="card mx-auto">
+                  <div class="card-header"><span class="mdi mdi-file-document-outline"></span> Files</div>
+                  <ul class="list-group list-group-flush">
+                    <?php
+                      if (count($files) == 0) {
+                        echo("<center><b>No files uploaded</b></center>");
+                      } else {
+                        foreach($files as $file) {
+                    ?>
+                      <li class="list-group-item">
+                        <div class="container">
+                          <div class="row">
+                            <span class="requestinfo"><b><?php echo(get_user_name($db, $file['user'])); ?></b></span>
+                            <span class="requestinfo requestinfo-spaced text-muted"><i> <?php echo($file['created']); ?></i></span>
+                          </div>
+                          <div class="row">
+                            <a target="_blank" href="<?php echo('/actions/download?file=' . $file['id']); ?>"><span><?php echo($file['filename']); ?></span></a>
+                          </div>
+                        </div>
+                      </li>
+                    <?php } } ?>
+                  </ul>
+                </div>
+              </div>
+
+            <div class="col-6">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-update"></span> Updates</div>
+                <ul class="list-group list-group-flush">
+                  <?php
+                    if (count($updates) == 0) {
+                      echo("<center><b>No updates</b></center>");
+                    } else {
+                      foreach($updates as $update) {
+                  ?>
+                    <li class="list-group-item">
+                      <div class="container">
+                        <div class="row">
+                          <span class="requestinfo"><b><?php echo(get_user_name($db, $update['user'])); ?></b></span>
+                          <span class="requestinfo requestinfo-spaced text-muted"><i> <?php echo($update['created']); ?></i></span>
+                        </div>
+                        <div class="row">
+                          <span><?php echo(filter_var($update['msg'], FILTER_SANITIZE_STRING)); ?></span>
+                        </div>
+                      </div>
+                    </li>
+                  <?php } } ?>
+                </ul>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </section>
+    <?php } else if ($is_authorised == false) { ?>
+      <section class="jumbotron text-center">
+        <div class="container">
+          <h1>You are not authorised to see this page.</h1>
+        </div>
+      </section>
+    <?php } } ?>
+
+</main>
+
+<?php
+    require_once __DIR__ . "/../includes/footer.php";
+?>

app/public/index.php

@@ -10,13 +10,9 @@
 ?>
 
 
-
-<!-- Begin page content -->
-<main role="main" class="flex-shrink-0">
-
   <section>
     <?php
-      if(isset($alert)) {
+      if (isset($alert)) {
           echo("
         <div class='container'>
           <div class='alert alert-" . $alert[0] . " alert-dismissible fade show' role='alert'>
@@ -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>
@@ -65,7 +65,7 @@
                 if (count($requests) == 0) {
                     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">
@@ -80,7 +80,9 @@
                   </div>
                 </div>
               </li>
-              <?php } } ?>
+              <?php
+                    }
+                } ?>
             </ul>
           </div>
         </div>
@@ -95,7 +97,7 @@
                 if (count($subscriptions) == 0) {
                     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";
 ?>