X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/176e85a6f5d6274e96a175d57b007c7afe677299..e2e6d4c1c37aff2e6b50331cb31af9d59536624f:/issue/index.php

diff --git a/issue/index.php b/issue/index.php
index 6b1c3dc..f950861 100644
--- a/issue/index.php
+++ b/issue/index.php
@@ -6,25 +6,31 @@ 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;
+	$author = $Issue->author ? new User('profile/'.$Issue->author, FALSE) : NULL;
 	printf('<p><em>%s</em>%s <small class=date>%s</small></p>'."\n",
 		'Geplaatst',
-		$row->author ? " door <strong>{$row->author}</strong>" : '',
-		showdate(preg_split('/\D/', $row->created))
+		$author ? " door <strong>{$author->name}</strong>" : '',
+		showdate(preg_split('/\D/', $Issue->created))
 	);
-	if ($row->closed) {
+	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/', $row->closed))
+			showdate(preg_split('/\D/', $Issue->closed))
 		);
 	}
+	print $Issue->body;
 	$Args = "/$id";  # minimal reference
 	print placeholder_include('reply');
 	return;
@@ -33,7 +39,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,
@@ -45,16 +51,27 @@ if ($_POST) {
 		$_POST = [];
 }
 
-$query = $Db->query('SELECT * FROM issues ORDER BY updated DESC');
+$cols = "*, (SELECT count(*) FROM comments WHERE"
+	. " page=i.page||'/'||i.id AND message IS NOT NULL) AS replycount";
+$sql = "SELECT $cols FROM issues i 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>';
 while ($row = $query->fetch()) {
-	printf('<li><a href="%s">%s <small class="date">%s</small></a>',
+	printf('<li><a href="%s">%s <small class="date">%s</small>%s</a>',
 		"/$Page/{$row->id}/{$row->link}",
 		sprintf($row->closed ? '<strike>%s</strike>' : '%s',
 			htmlspecialchars($row->subject)),
-		showdate(array_slice(preg_split('/\D/', $row->updated), 0, 3))
+		showdate(array_slice(preg_split('/\D/', $row->updated), 0, 3)),
+		implode(' ', [
+			$row->replycount ? sprintf('<span class=right>+%d</span>', $row->replycount) : '',
+			isset($row->assign) ? ' <em class="right">'.$row->assign.'</em>' : '',
+		])
 	);
 	print "</li>\n";
 }