Update docker Docker tag to v20.10.23 (#162)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/build.yml

@@ -0,0 +1,64 @@
+name: Deploy
+on:
+  push:
+    branches: main
+
+jobs:
+  tests:
+      name: Tests
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v2
+          with:
+            fetch-depth: 0
+        - name: Setup PHP with Xdebug
+          uses: shivammathur/setup-php@v2
+          with:
+            php-version: '8.1'
+            coverage: xdebug 
+        - name: Install dependencies with composer
+          run: composer update --no-ansi --no-interaction --no-progress
+        - name: Run tests with phpunit/phpunit
+          run: vendor/bin/phpunit --coverage-clover=coverage.xml
+        - name: Fix code coverage paths
+          run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
+        - name: SonarCloud Scan
+          uses: SonarSource/sonarcloud-github-action@master
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+  release-on-push:
+    runs-on: ubuntu-latest
+    outputs: 
+      ver: ${{ steps.release.outputs.version }}
+      tag: ${{ steps.release.outputs.tag_name }}
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Get Release
+        id: release
+        uses: rymndhng/release-on-push-action@master
+        with:
+          bump_version_scheme: patch
+      - name: Check Release Output
+        id: rop-check
+        run: |
+          echo "Got tag name ${{ steps.release.outputs.tag_name }}"
+          echo "Got release version ${{ steps.release.outputs.version }}"
+
+  build:
+    name: GitHub Container Registry
+    runs-on: ubuntu-latest
+    needs: [tests, release-on-push]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Login to GitHub Container Registry
+      run: echo ${{ secrets.PAT }} | docker login ghcr.io -u luketainton --password-stdin
+    - name: Build image for GitHub Container Registry
+      run: docker build . --file Dockerfile --tag ghcr.io/luketainton/fhed:${{ needs.release-on-push.outputs.ver }} --tag ghcr.io/luketainton/fhed:latest
+    - name: Push image to GitHub Container Registry
+      run: |
+        docker push ghcr.io/luketainton/fhed:latest
+        docker push ghcr.io/luketainton/fhed:${{ needs.release-on-push.outputs.ver }}

.github/workflows/deploy.yml

@@ -1,67 +0,0 @@
-name: Deploy
-on:
-  push:
-    branches: main
-
-jobs:
-  release-on-push:
-    runs-on: ubuntu-latest
-    outputs: 
-      ver: ${{ steps.release.outputs.version }}
-      tag: ${{ steps.release.outputs.tag_name }}
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - id: release
-        uses: rymndhng/release-on-push-action@master
-        with:
-          bump_version_scheme: minor
-          
-      - name: Check Output Parameters
-        run: |
-          echo "Got tag name ${{ steps.release.outputs.tag_name }}"
-          echo "Got release version ${{ steps.release.outputs.version }}"
-
-  docker-dh:
-    name: Push to Docker Hub
-    needs: [release-on-push]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - 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.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.outputs.tag }} &&
-        docker push luketainton/fhed:latest
-      
-  docker-ghr:
-    name: Push to GitHub Package Registry
-    needs: [release-on-push]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - 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.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.outputs.tag }} &&
-        docker push docker.pkg.github.com/luketainton/fhed/fhed:latest
-
-  deploy:
-    name: Update Docker image on server
-    runs-on: ubuntu-latest
-    needs: [docker-dh]
-    steps:
-    - name: Update image on server
-      uses: garygrossgarten/github-action-ssh@release
-      with:
-        command: cd /docker/active/fhed && docker-compose pull && docker-compose up -d
-        host: ${{ secrets.SSH_HOST }}
-        port: ${{ secrets.SSH_PORT }}
-        username: ${{ secrets.SSH_USERNAME }}
-        privateKey: ${{ secrets.SSH_SSHKEY }}

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v1
+    - uses: actions/stale@v7
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue has been marked as stale due to inactivity. If this issue is still ongoing, please leave a comment.'

.gitlab-archive/.gitlab-ci.yml

@@ -0,0 +1,18 @@
+stages:
+- build
+
+build:
+  stage: build
+  only:
+  - tags
+  image: docker:20.10.23
+  services:
+  - docker:20.10.23-dind
+  variables:
+    IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+  script:
+  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  - docker build -t $CI_REGISTRY_IMAGE:latest -t $IMAGE_TAG .
+  - docker build -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest .
+  - docker push $IMAGE_TAG
+  - docker push $CI_REGISTRY_IMAGE:latest

Dockerfile

@@ -4,6 +4,7 @@ RUN composer --working-dir=/srv install
 
 FROM php:apache
 LABEL maintainer="Luke Tainton <luke@tainton.uk>"
+LABEL org.opencontainers.image.source="https://github.com/luketainton/fhed"
 ARG VERSION
 RUN docker-php-ext-install pdo_mysql && a2enmod rewrite remoteip
 COPY vhost.conf /etc/apache2/sites-enabled/000-default.conf

app/.env.sample

@@ -14,4 +14,4 @@ OIDC_CLIENT_ID     = ""
 OIDC_CLIENT_SECRET = ""
 OIDC_DISABLE_SSL   = ""
 
-SENTRY_ENVIRONMENT = ""
+SENTRY_ENVIRONMENT = ""

app/composer.json

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

app/includes/app_functions.php

@@ -8,31 +8,21 @@
 
   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;
+      $_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;
-    }
+      if (isset($_SESSION['is_signed_in'])) {
+          return true;
+      } else {
+          return false;
+      }
   }
 
   function user_exists($db, $uuid)
@@ -48,9 +38,9 @@
           die();
       }
       if (empty($result)) {
-         return false;
+          return false;
       } else {
-         return true;
+          return true;
       }
   }
 

app/includes/prereqs.php

@@ -18,15 +18,16 @@ Sentry\init([
 
 // 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
@@ -38,8 +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);
+    $oidc->setVerifyHost(false);
+    $oidc->setVerifyPeer(false);
 }

app/public/agent/editsub.php

@@ -1,173 +0,0 @@
-<?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

@@ -1,105 +0,0 @@
-<?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

@@ -1,95 +0,0 @@
-<?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

@@ -1,69 +0,0 @@
-<?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

@@ -1,155 +0,0 @@
-<?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

@@ -1,155 +0,0 @@
-<?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

@@ -1,209 +0,0 @@
-<?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/update.php

@@ -6,6 +6,8 @@
     $updates = get_updates($db, $request);
     $authorised_users = get_subscribers($db, $request);
     $is_authorised = isAuthorised($_SESSION['uuid'], $authorised_users, $request);
+
+    $rid = htmlspecialchars($_GET['rid'])
 ?>
 
 
@@ -131,7 +133,7 @@
                     <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>
+                      <a href="/view?rid=<?php echo($rid); ?>" class="btn btn-danger" style="margin-top: 2%;">Cancel</a>
                     </div>
                   </form>
               </div>

app/public/upload.php

@@ -6,6 +6,8 @@
     $updates = get_updates($db, $request);
     $authorised_users = get_subscribers($db, $request);
     $is_authorised = isAuthorised($_SESSION['uuid'], $authorised_users, $request);
+
+    $rid = htmlspecialchars($_GET['rid']);
 ?>
 
 
@@ -131,7 +133,7 @@
                     <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>
+                      <a href="/view?rid=<?php echo($rid); ?>" class="btn btn-danger" style="margin-top: 2%;">Cancel</a>
                     </div>
                   </form>
               </div>

sonar-project.properties

@@ -0,0 +1,12 @@
+sonar.projectKey=luketainton_FHeD
+sonar.organization=luketainton
+
+# This is the name and version displayed in the SonarCloud UI.
+#sonar.projectName=FHeD
+#sonar.projectVersion=1.0
+
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+#sonar.sources=.
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8