auth: append login to formatted user names

[minimedit.git] / issue / index.php

diff --git a/issue/index.php b/issue/index.php
index e7c69bb49de71088c48f8927dc2b3035685659a9..bb556f2019d6e259d70ca8a943cdc40757b75c50 100644 (file)
--- a/issue/index.php
+++ b/issue/index.php
@@ -3,7 +3,7 @@ global $User, $Db;
 require_once 'database.inc.php';
 @list ($id, $title) = explode('/', ltrim($Args, '/'));
 
-if ($id) {
+if ($id and ctype_digit($id)) {
        $Article->title = "Issue #$id";
 
        $Issue = $Db->query(
@@ -16,7 +16,7 @@ if ($id) {
        $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>" : '',
+               $author ? " door <strong>{$author->html}</strong>" : '',
                showdate(preg_split('/\D/', $Issue->created))
        );
        if ($Issue->assign) {
@@ -51,22 +51,32 @@ if ($_POST) {
                $_POST = [];
 }
 
-$sql = 'SELECT * FROM issues WHERE page = ?';
+$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]);
 
+if ($id == 'feed') {
+       require 'issue/feed.inc.php';
+}
+
 ob_start();
 print '<ul>';
 while ($row = $query->fetch()) {
-       printf('<li><a href="%s">%s <small class="date">%s</small>%s</a>',
+       printf('<li%s><a href="%s">%s <small class="date">%s</small>%s</a>',
+               $row->closed ? ' class="disabled"' : '',
                "/$Page/{$row->id}/{$row->link}",
-               sprintf($row->closed ? '<strike>%s</strike>' : '%s',
+               sprintf($row->closed ? '<s>%s</s>' : '%s',
                        htmlspecialchars($row->subject)),
                showdate(array_slice(preg_split('/\D/', $row->updated), 0, 3)),
-               isset($row->assign) ? ' <em class="right">'.$row->assign.'</em>' : ''
+               implode(' ', [
+                       $row->replycount ? sprintf('<span class=right>+%d</span>', $row->replycount) : '',
+                       isset($row->assign) ? '<em class="right">'.$row->assign.'</em>' : '',
+               ])
        );
        print "</li>\n";
 }