From 27cd8d168d616f4e26b0e06490e65d964b92e23a Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Mon, 10 Aug 2020 16:09:34 +0100
Subject: [PATCH] :art: Fix file names and add link on view.php

Signed-off-by: Luke Tainton <luke@tainton.uk>
---
 app/public/editsub.php                        | 91 ++++++++++---------
 app/public/{managesub.php => editsub.php.old} | 91 +++++++++----------
 app/public/view.php                           |  5 +-
 3 files changed, 94 insertions(+), 93 deletions(-)
 rename app/public/{managesub.php => editsub.php.old} (62%)

diff --git a/app/public/editsub.php b/app/public/editsub.php
index 127379c..e403603 100644
--- a/app/public/editsub.php
+++ b/app/public/editsub.php
@@ -1,11 +1,12 @@
 <?php
-    $PAGE_NAME = "Upload file";
+    $PAGE_NAME = "Manage request subscribers";
     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);
+
+    $all_users = get_all_users($db);
 ?>
 
 
@@ -38,7 +39,9 @@
           <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>
+                <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">
@@ -90,51 +93,53 @@
 
             <div class="col-8">
               <div class="card mx-auto">
-                <div class="card-header"><span class="mdi mdi-update"></span> Updates</div>
+                <div class="card-header">
+                  <span class="mdi mdi-rss"></span> Manage Subscribers
+                </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 style="display: inline;"><b><?php echo(get_user_name($db, $update['user'])); ?></b></span><span class="text-muted"><i><?php echo(" " . $update['created']); ?></i></span>
-                        </div>
-                        <div class="row">
-                          <span><?php echo($update['msg']); ?></span>
-                        </div>
+                  <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($authorised_users as $usr) {
+                                  $usr_name = get_user_name($db, $usr['uuid']) . " (" . $usr['uid'] . ")";
+                                  echo("<option value='" . $usr['uuid'] . "'>" . $usr_name . "</option>");
+                                } ?>
+                            </select>
+                          </div>
+                          <button type="submit" class="btn btn-danger">Submit</button>
+                        </form>
                       </div>
-                    </li>
-                  <?php } } ?>
+                    </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_name = get_user_name($db, $usr['uuid']) . " (" . $usr['uid'] . ")";
+                                  echo("<option value='" . $usr['uuid'] . "'>" . $usr_name . "</option>");
+                                }
+                              } ?>
+                            </select>
+                          </div>
+                          <button type="submit" class="btn btn-primary">Submit</button>
+                        </form>
+                      </div>
+                    </div>
+                  </li>
                 </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> Edit Subscriber</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>
diff --git a/app/public/managesub.php b/app/public/editsub.php.old
similarity index 62%
rename from app/public/managesub.php
rename to app/public/editsub.php.old
index e403603..127379c 100644
--- a/app/public/managesub.php
+++ b/app/public/editsub.php.old
@@ -1,12 +1,11 @@
 <?php
-    $PAGE_NAME = "Manage request subscribers";
+    $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);
-
-    $all_users = get_all_users($db);
 ?>
 
 
@@ -39,9 +38,7 @@
           <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>
+                <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">
@@ -93,53 +90,51 @@
 
             <div class="col-8">
               <div class="card mx-auto">
-                <div class="card-header">
-                  <span class="mdi mdi-rss"></span> Manage Subscribers
-                </div>
+                <div class="card-header"><span class="mdi mdi-update"></span> Updates</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($authorised_users as $usr) {
-                                  $usr_name = get_user_name($db, $usr['uuid']) . " (" . $usr['uid'] . ")";
-                                  echo("<option value='" . $usr['uuid'] . "'>" . $usr_name . "</option>");
-                                } ?>
-                            </select>
-                          </div>
-                          <button type="submit" class="btn btn-danger">Submit</button>
-                        </form>
+                  <?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 style="display: inline;"><b><?php echo(get_user_name($db, $update['user'])); ?></b></span><span class="text-muted"><i><?php echo(" " . $update['created']); ?></i></span>
+                        </div>
+                        <div class="row">
+                          <span><?php echo($update['msg']); ?></span>
+                        </div>
                       </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_name = get_user_name($db, $usr['uuid']) . " (" . $usr['uid'] . ")";
-                                  echo("<option value='" . $usr['uuid'] . "'>" . $usr_name . "</option>");
-                                }
-                              } ?>
-                            </select>
-                          </div>
-                          <button type="submit" class="btn btn-primary">Submit</button>
-                        </form>
-                      </div>
-                    </div>
-                  </li>
+                    </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> Edit Subscriber</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>
diff --git a/app/public/view.php b/app/public/view.php
index 65bb1e6..6d58f22 100644
--- a/app/public/view.php
+++ b/app/public/view.php
@@ -53,8 +53,9 @@
           <?php if ($request['status'] != 'Closed') { ?>
             <p>
               <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-secondary my-2'>Add attachment(s)</a>
-              <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#closeModal">Close the request</button>
+              <a href='/upload?rid=<?php echo($request["uuid"]); ?>' class='btn btn-primary my-2'>Add attachment(s)</a>
+              <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>
             </p>
           <?php } ?>
         </div>