issue: populate ticket data before reply include

[minimedit.git] / issue / index.php

diff --git a/issue/index.php b/issue/index.php
index d07a7863af8a57528077c5de10233c5d70d7e61a..cefe00f363f8765f22faa649267ebfbab2efe751 100644 (file)
--- a/issue/index.php
+++ b/issue/index.php
@@ -3,45 +3,47 @@ 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";
-
+       $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);
        print "<h2>{$Article->title}</h2>\n";
-       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))
-       );
+       print "<dl class=\"aside right sidebar\">\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)));
        }
-       $Args = "/$id";  # minimal reference
-       print placeholder_include('reply');
+       print "</dl>\n\n";
+
+       print '<div>';
+       print $Issue->body;
+       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()) {
@@ -50,23 +52,34 @@ 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></a>',
+       printf('<li%s><div><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))
+               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";
+       print "</div></li>\n";
 }
 print "</ul>\n";
 $Place['issuelist'] = ob_get_clean();