From 1a5565c3df2bd364f681a0c7cc92110694fa42ae Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Mon, 10 Aug 2020 16:27:22 +0100
Subject: [PATCH] :bug: Fix subscribers loading issue

Signed-off-by: Luke Tainton <luke@tainton.uk>
---
 app/public/actions/addsub.php |   4 +-
 app/public/actions/delsub.php |   4 +-
 app/public/editsub.php        |   8 +-
 app/public/editsub.php.old    | 154 ----------------------------------
 4 files changed, 7 insertions(+), 163 deletions(-)
 delete mode 100644 app/public/editsub.php.old

diff --git a/app/public/actions/addsub.php b/app/public/actions/addsub.php
index 6a18db0..e7a9ca3 100644
--- a/app/public/actions/addsub.php
+++ b/app/public/actions/addsub.php
@@ -19,11 +19,11 @@
               $alert = array("danger", "Failed to add subscriber: " . $e->getMessage());
           }
         }
-        $newURL = "/managesub?rid=" . $request['uuid'];
+        $newURL = "/editsub?rid=" . $request['uuid'];
         echo("<script>window.location = '$newURL'</script>");
     } else {
         $alert = array("danger", "You are not authorised to manage subscribers on this request.");
-        $newURL = "/managesub?rid=" . $request['uuid'];
+        $newURL = "/editsub?rid=" . $request['uuid'];
         echo("<script>window.location = '$newURL'</script>");
     }
 
diff --git a/app/public/actions/delsub.php b/app/public/actions/delsub.php
index 917e59a..1229447 100644
--- a/app/public/actions/delsub.php
+++ b/app/public/actions/delsub.php
@@ -21,11 +21,11 @@
             }
           }
         }
-        $newURL = "/managesub?rid=" . $request['uuid'];
+        $newURL = "/editsub?rid=" . $request['uuid'];
         echo("<script>window.location = '$newURL'</script>");
     } else {
         $alert = array("danger", "You are not authorised to manage subscribers on this request.");
-        $newURL = "/managesub?rid=" . $request['uuid'];
+        $newURL = "/editsub?rid=" . $request['uuid'];
         echo("<script>window.location = '$newURL'</script>");
     }
 
diff --git a/app/public/editsub.php b/app/public/editsub.php
index e403603..293bc1b 100644
--- a/app/public/editsub.php
+++ b/app/public/editsub.php
@@ -106,8 +106,7 @@
                             <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>");
+                                  echo("<option value='" . $usr['uuid'] . "'>" . get_user_name($db, $usr) . "</option>");
                                 } ?>
                             </select>
                           </div>
@@ -125,9 +124,8 @@
                             <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>");
+                                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>
diff --git a/app/public/editsub.php.old b/app/public/editsub.php.old
deleted file mode 100644
index 127379c..0000000
--- a/app/public/editsub.php.old
+++ /dev/null
@@ -1,154 +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 style="display: inline;"><b>Status:</b></span>
-                        <span style="display: inline; margin-left: 1%;"><?php echo($request['status']); ?></span>
-                      </div>
-                    </div>
-                  </li>
-                  <li class="list-group-item">
-                    <div class="container">
-                      <div class="row">
-                        <span style="display: inline;"><b>Created by:</b></span>
-                        <span style="display: inline; margin-left: 1%;"><?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 style="display: inline;"><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 style="display: inline;"><b>Created:</b></span>
-                        <span style="display: inline; margin-left: 1%;"><?php echo($request['created_on']); ?></span>
-                      </div>
-                    </div>
-                  </li>
-                  <li class="list-group-item">
-                    <div class="container">
-                      <div class="row">
-                        <span style="display: inline;"><b>Last updated:</b></span>
-                        <span style="display: inline; margin-left: 1%;"><?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 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>
-                    </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>
-
-    <?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";
-?>