X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/55cb3025c5506ec7faaa1818a4d8161aaad19c27..23d1415e31c8cb5db2756959e8951ca5f28c476d:/issue/index.php

diff --git a/issue/index.php b/issue/index.php
index d8f9c26..d07a786 100644
--- a/issue/index.php
+++ b/issue/index.php
@@ -6,17 +6,28 @@ require_once 'database.inc.php';
 if ($id) {
 	$Article->title = "Issue #$id";
 
-	$row = $Db->query(
-		'SELECT * FROM issues WHERE id = ?', [$id]
+	$Issue = $Db->query(
+		'SELECT * FROM issues WHERE page = ? AND id = ?', [$Page, $id]
 	)->fetch();
-	if (!$row) throw new Exception('Issuenummer niet gevonden');
+	if (!$Issue) throw new Exception('Issuenummer niet gevonden');
 
-	$Article->title .= ': '.htmlspecialchars($row->subject);
+	$Article->title .= ': '.htmlspecialchars($Issue->subject);
 	print "<h2>{$Article->title}</h2>\n";
-	print $row->body;
-	if ($row->closed) {
-		printf('<p><strong>%s</strong> <small class=date>%s</small></p>'."\n",
-			'Opgelost', showdate(preg_split('/\D/', $row->closed))
+	print $Issue->body;
+	printf('<p><em>%s</em>%s <small class=date>%s</small></p>'."\n",
+		'Geplaatst',
+		$Issue->author ? " door <strong>{$Issue->author}</strong>" : '',
+		showdate(preg_split('/\D/', $Issue->created))
+	);
+	if ($Issue->assign) {
+		printf('<p><em>%s</em> aan <strong>%s</strong></p>'."\n",
+			'Toegewezen', htmlspecialchars($Issue->assign)
+		);
+	}
+	if ($Issue->closed) {
+		printf('<p><em>%s</em>%s <small class=date>%s</small></p>'."\n",
+			'Opgelost', '',
+			showdate(preg_split('/\D/', $Issue->closed))
 		);
 	}
 	$Args = "/$id";  # minimal reference
@@ -27,7 +38,7 @@ if ($id) {
 if ($_POST) {
 		$html = nl2br(htmlspecialchars($_POST['body']));
 		$html = empty($html) ? NULL : "<p>$html</p>";
-		$query = $Db->insert('issues', [
+		$query = $Db->set('issues', [
 			'page'    => $Page,
 			'subject' => $_POST['subject'],
 			'body'    => $html,
@@ -39,7 +50,12 @@ if ($_POST) {
 		$_POST = [];
 }
 
-$query = $Db->query('SELECT * FROM issues ORDER BY created DESC');
+$sql = 'SELECT * FROM issues WHERE page = ?';
+if (isset($_GET['open'])) {
+	$sql .= ' AND closed IS NULL';
+}
+$sql .= ' ORDER BY closed IS NOT NULL, updated DESC';
+$query = $Db->query($sql, [$Page]);
 
 ob_start();
 print '<ul>';
@@ -48,7 +64,7 @@ while ($row = $query->fetch()) {
 		"/$Page/{$row->id}/{$row->link}",
 		sprintf($row->closed ? '<strike>%s</strike>' : '%s',
 			htmlspecialchars($row->subject)),
-		showdate(array_slice(preg_split('/\D/', $row->created), 0, 3))
+		showdate(array_slice(preg_split('/\D/', $row->updated), 0, 3))
 	);
 	print "</li>\n";
 }