archives/FHeD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 40 Activity

Merge branch 'main' into brokenexisting

Browse Source
This commit is contained in:
Alexander Davis
2020-08-10 14:17:59 +01:00
committed by GitHub
parent c7dcf62353 f4cf8e2e16
commit b532361440
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/public/actions/close.php
View File

@@ -12,7 +12,7 @@
try { try {
$stmt = "UPDATE tickets SET status='Closed' WHERE uuid=:uuid"; $stmt = "UPDATE tickets SET status='Closed' WHERE uuid=:uuid";
$sql = $db->prepare($stmt); $sql = $db->prepare($stmt);
$sql->bindParam(':uuid', $request['uuid']); $sql->bindParam(':uuid', $_GET['rid']);
$sql->execute(); $sql->execute();
} catch (PDOException $e) { } catch (PDOException $e) {
$alert = array("danger", "Failed to close request: " . $e->getMessage()); $alert = array("danger", "Failed to close request: " . $e->getMessage());

7
app/public/existing.php
View File

@@ -3,14 +3,9 @@
require_once __DIR__ . "/../includes/header.php"; require_once __DIR__ . "/../includes/header.php";
if (is_signed_in()) { if (is_signed_in()) {
$closed_requests = get_my_open_requests($db); $closed_requests = get_my_closed_requests($db);
$subscriptions = get_subscribed_requests($db); $subscriptions = get_subscribed_requests($db);
<<<<<<< Updated upstream
$requests = get_my_requests($db);
=======
$open_requests = get_my_open_requests($db); $open_requests = get_my_open_requests($db);
>>>>>>> Stashed changes
foreach($requests as $req) { foreach($requests as $req) {
if ($req['status'] != "Closed") { if ($req['status'] != "Closed") {