X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/8dfcd9f98a316599cae7d94f56069c4ba79d2c93..3b7350299c92ff6de3b7980791657de1f5269e48:/issue/index.php

diff --git a/issue/index.php b/issue/index.php
index 388db5d..cc17f03 100644
--- a/issue/index.php
+++ b/issue/index.php
@@ -5,44 +5,48 @@ require_once 'database.inc.php';
 
 if ($id and ctype_digit($id)) {
 	$Article->title = "Issue #$id";
-
+	$Args = "/$id";  # minimal reference
 	$Issue = $Db->query(
 		'SELECT * FROM issues WHERE page = ? AND id = ?', [$Page, $id]
 	)->fetch();
 	if (!$Issue) throw new Exception('Issuenummer niet gevonden');
 
+	$replies = placeholder_include('reply');  # handle updates
+
 	$Article->title .= ': '.htmlspecialchars($Issue->subject);
+	$Article->teaser = $Issue->body;
+	$Article->body = $replies;  # find image
+
 	print "<h2>{$Article->title}</h2>\n";
-	$author = $Issue->author ? new User('profile/'.$Issue->author, FALSE) : NULL;
-	printf('<p><em>%s</em>%s <small class=date>%s</small></p>'."\n",
-		'Geplaatst',
-		$author ? " door <strong>{$author->name}</strong>" : '',
-		showdate(preg_split('/\D/', $Issue->created))
-	);
+	print '<aside class="metadata"><dl>'."\n";
+	print '<dt>Geplaatst</dt>';
+	printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->created)));
+	if ($Issue->author and $author = new User('profile/'.$Issue->author, FALSE)) {
+		printf('<dd>%s</dd>'."\n", $author->html);
+	}
 	if ($Issue->assign) {
-		printf('<p><em>%s</em> aan <strong>%s</strong></p>'."\n",
-			'Toegewezen', htmlspecialchars($Issue->assign)
-		);
+		print '<dt>Toegewezen aan</dt>';
+		printf('<dd>%s</dd>'."\n", 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))
-		);
+		print '<dt>Opgelost</dt>';
+		printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->closed)));
 	}
+	print "</dl></aside>\n\n";
+
+	print '<div>';
 	print $Issue->body;
-	$Args = "/$id";  # minimal reference
-	print placeholder_include('reply');
+	print $replies;
+	print "</div>\n";
 	return;
 }
 
 if ($_POST) {
-		$html = nl2br(htmlspecialchars($_POST['body']));
-		$html = empty($html) ? NULL : "<p>$html</p>";
+		require_once 'upload.inc.php';
 		$query = $Db->set('issues', [
 			'page'    => $Page,
 			'subject' => $_POST['subject'],
-			'body'    => $html,
+			'body'    => messagehtml($_POST['body']),
 			'author'  => $User->login,
 		]);
 		if (!$query->rowCount()) {
@@ -51,8 +55,9 @@ if ($_POST) {
 		$_POST = [];
 }
 
-$cols = "*, (SELECT count(*) FROM comments WHERE"
-	. " page=i.page||'/'||i.id AND message IS NOT NULL) AS replycount";
+$subsql = "SELECT count(*) FROM comments WHERE page=i.page||'/'||i.id";
+$cols = "*, ($subsql AND message IS NOT NULL) AS replycount";
+$cols .= ", ($subsql AND message ~ '<img') AS imagecount";
 $sql = "SELECT $cols FROM issues i WHERE page = ?";
 if (isset($_GET['open'])) {
 	$sql .= ' AND closed IS NULL';
@@ -67,18 +72,29 @@ if ($id == 'feed') {
 ob_start();
 print '<ul>';
 while ($row = $query->fetch()) {
-	printf('<li%s><a href="%s">%s <small class="date">%s</small>%s</a>',
+	printf('<li%s><div><a href="%s">',
 		$row->closed ? ' class="disabled"' : '',
-		"/$Page/{$row->id}/{$row->link}",
-		sprintf($row->closed ? '<s>%s</s>' : '%s',
-			htmlspecialchars($row->subject)),
-		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>' : '',
-		])
+		"/$Page/{$row->id}/{$row->link}"
 	);
-	print "</li>\n";
+	printf($row->closed ? '<s>%s</s>' : '%s', htmlspecialchars($row->subject));
+	{
+		printf(' <small class="date">%s</small>',
+			showdate(array_slice(preg_split('/\D/', $row->updated), 0, 3))
+		);
+	}
+	if ($row->replycount) {
+		printf(' <span class=right>%s %d</span>',
+			'<span class="icon icon-comment" title="reacties">&#x1F5E8;</span>',
+			$row->replycount
+		);
+	}
+	if ($row->imagecount) {
+		print ' <span class="right icon icon-camera" title="afbeeldingen">&#x1F4F7;</span>';
+	}
+	if (isset($row->assign)) {
+		print ' <em class="right">'.$row->assign.'</em>';
+	}
+	print "</a></div></li>\n";
 }
 print "</ul>\n";
 $Place['issuelist'] = ob_get_clean();