X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/0f7747af6751b55fb297a4e90f8c2ba6232bd0b9..v4.5-23-gb9757db578:/issue/index.php

diff --git a/issue/index.php b/issue/index.php
index 8a3d907..e8a36d2 100644
--- a/issue/index.php
+++ b/issue/index.php
@@ -1,21 +1,25 @@
 <?php
 global $User, $Db;
 require_once 'database.inc.php';
-@list ($id, $title) = explode('/', ltrim($Args, '/'));
+@list ($id, $title) = explode('/', ltrim($Page->path, '/'));
 
 if ($id and ctype_digit($id)) {
-	$Article->title = "Issue #$id";
-	$Args = "/$id";  # minimal reference
+	$Page->title = "Issue #$id";
+	$Page->path = "/$id";  # minimal reference
 	$Issue = $Db->query(
-		'SELECT * FROM issues WHERE page = ? AND id = ?', [$Page, $id]
+		'SELECT * FROM issues WHERE page = ? AND id = ?', [$Page->handler, $id]
 	)->fetch();
 	if (!$Issue) throw new Exception('Issuenummer niet gevonden');
 
-	$replies = placeholder_include('reply');  # handle updates
+	$replies = $Page->widget('reply');  # handle updates
 
-	$Article->title .= ': '.htmlspecialchars($Issue->subject);
-	print "<h2>{$Article->title}</h2>\n";
-	print "<dl class=\"aside right sidebar\">\n";
+	$Page->title .= ': '.htmlspecialchars($Issue->subject);
+	$Page->teaser = $Issue->body;
+	if (!$User) return;
+	$Page->body = $replies;  # find image
+
+	print "<h2>{$Page->title}</h2>\n";
+	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)) {
@@ -29,7 +33,7 @@ if ($id and ctype_digit($id)) {
 		print '<dt>Opgelost</dt>';
 		printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->closed)));
 	}
-	print "</dl>\n\n";
+	print "</dl></aside>\n\n";
 
 	print '<div>';
 	print $Issue->body;
@@ -37,11 +41,12 @@ if ($id and ctype_digit($id)) {
 	print "</div>\n";
 	return;
 }
+elseif (!$User) return;
 
 if ($_POST) {
 		require_once 'upload.inc.php';
 		$query = $Db->set('issues', [
-			'page'    => $Page,
+			'page'    => $Page->handler,
 			'subject' => $_POST['subject'],
 			'body'    => messagehtml($_POST['body']),
 			'author'  => $User->login,
@@ -54,13 +59,13 @@ if ($_POST) {
 
 $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";
+$cols .= ", ($subsql AND message ~ '<img') AS imagecount";
 $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]);
+$query = $Db->query($sql, [$Page->handler]);
 
 if ($id == 'feed') {
 	require 'issue/feed.inc.php';
@@ -69,19 +74,29 @@ if ($id == 'feed') {
 ob_start();
 print '<ul>';
 while ($row = $query->fetch()) {
-	printf('<li%s><div><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->imagecount ? sprintf('<span class=right><i class="right icon images" title="afbeeldingen">*</i></span>') : '',
-			$row->replycount ? sprintf('<span class=right><i class="icon replies" title="reacties">+</i>%d</span>', $row->replycount) : '',
-			isset($row->assign) ? '<em class="right">'.$row->assign.'</em>' : '',
-		])
+		"/{$Page->handler}/{$row->id}/{$row->link}"
 	);
-	print "</div></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();
+$Page->place['issuelist'] = ob_get_clean();