From cf94a026850029e5c2e3bbaa4d3e14eb891b95c4 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Mon, 31 Aug 2020 17:19:41 +0100
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Move=20opening=20and=20closi?=
 =?UTF-8?q?ng=20'main'=20tags?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Luke Tainton <luke@tainton.uk>
---
 app/includes/footer.php | 1 +
 app/includes/header.php | 2 ++
 app/public/index.php    | 6 ------
 3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/app/includes/footer.php b/app/includes/footer.php
index 88ecd57..07e32cb 100644
--- a/app/includes/footer.php
+++ b/app/includes/footer.php
@@ -1,3 +1,4 @@
+</main>
 <footer class="footer mt-auto py-3">
   <div class="text-center text-muted">
     <?php
diff --git a/app/includes/header.php b/app/includes/header.php
index 28ffdd6..45ef664 100644
--- a/app/includes/header.php
+++ b/app/includes/header.php
@@ -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">
diff --git a/app/public/index.php b/app/public/index.php
index a2c703e..858585b 100644
--- a/app/public/index.php
+++ b/app/public/index.php
@@ -10,10 +10,6 @@
 ?>
 
 
-
-<!-- Begin page content -->
-<main role="main" class="flex-shrink-0">
-
   <section>
     <?php
       if(isset($alert)) {
@@ -118,8 +114,6 @@
     </div>
   <?php } ?>
 
-</main>
-
 <?php
     require_once __DIR__ . "/../includes/footer.php";
 ?>
-- 
2.49.1


From 0a62e920955d74ce60d0f1c2e60f8f89219c9812 Mon Sep 17 00:00:00 2001
From: "restyled-io[bot]" <32688539+restyled-io[bot]@users.noreply.github.com>
Date: Mon, 31 Aug 2020 17:32:55 +0100
Subject: [PATCH 2/2] Restyled by php-cs-fixer (#133)

Co-authored-by: Restyled.io <commits@restyled.io>
---
 app/includes/header.php | 10 +++++++---
 app/public/index.php    | 33 ++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/app/includes/header.php b/app/includes/header.php
index 45ef664..3117e23 100644
--- a/app/includes/header.php
+++ b/app/includes/header.php
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#563d7c">
     <link rel="icon" type="image/png" href="/favicon.png">
-    <title><?php echo( $PAGE_TITLE ); ?></title>
+    <title><?php echo($PAGE_TITLE); ?></title>
 
     <!-- Bootstrap core CSS -->
     <link rel="stylesheet" href="/css/bootstrap.min.css">
@@ -34,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">
diff --git a/app/public/index.php b/app/public/index.php
index 858585b..ee308be 100644
--- a/app/public/index.php
+++ b/app/public/index.php
@@ -3,8 +3,8 @@
     require_once __DIR__ . "/../includes/header.php";
 
     if (is_signed_in()) {
-      $requests = get_my_open_requests($db);
-      $subscriptions = get_open_subscribed_requests($db);
+        $requests = get_my_open_requests($db);
+        $subscriptions = get_open_subscribed_requests($db);
     }
 
 ?>
@@ -12,8 +12,8 @@
 
   <section>
     <?php
-      if(isset($alert)) {
-        echo("
+      if (isset($alert)) {
+          echo("
         <div class='container'>
           <div class='alert alert-" . $alert[0] . " alert-dismissible fade show' role='alert'>
             " . $alert[1] . "
@@ -23,7 +23,7 @@
           </div>
         </div>
       ");
-      unset($alert);
+          unset($alert);
       }
     ?>
   </section>
@@ -33,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>
@@ -59,10 +63,10 @@
             <ul class="list-group list-group-flush">
               <?php
                 if (count($requests) == 0) {
-                  echo("<center><b>No open tickets</b></center>");
+                    echo("<center><b>No open tickets</b></center>");
                 } else {
-                  foreach($requests as $tkt) {
-              ?>
+                    foreach ($requests as $tkt) {
+                        ?>
               <li class="list-group-item">
                 <div class="container">
                   <div class="row">
@@ -76,7 +80,9 @@
                   </div>
                 </div>
               </li>
-              <?php } } ?>
+              <?php
+                    }
+                } ?>
             </ul>
           </div>
         </div>
@@ -89,9 +95,9 @@
             <ul class="list-group list-group-flush">
               <?php
                 if (count($subscriptions) == 0) {
-                  echo("<center><b>No subscribed tickets</b></center>");
+                    echo("<center><b>No subscribed tickets</b></center>");
                 } else {
-                  foreach($subscriptions as $sub) { ?>
+                    foreach ($subscriptions as $sub) { ?>
               <li class="list-group-item">
                 <div class="container">
                   <div class="row">
@@ -105,7 +111,8 @@
                   </div>
                 </div>
               </li>
-              <?php } } ?>
+              <?php }
+                } ?>
             </ul>
           </div>
         </section>
-- 
2.49.1

