X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/05c560470887c86a30c82360d7be5caf0de1baa4..88fa0277fa6f5acd7e4d075840aca909b18317e0:/issue/index.php?ds=inline
diff --git a/issue/index.php b/issue/index.php
index a4b1314..4f0f57f 100644
--- a/issue/index.php
+++ b/issue/index.php
@@ -10,10 +10,32 @@ if ($id and ctype_digit($id)) {
'SELECT * FROM issues WHERE page = ? AND id = ?', [$Page->handler, $id]
)->fetch();
if (!$Issue) throw new Exception('Issuenummer niet gevonden');
+ $Page->title .= ': '.htmlspecialchars($Issue->subject);
- $replies = $Page->widget('reply'); # handle updates
+ if ($title and ctype_digit($title)) {
+ $Page->title = "Antwoord op {$Page->title}";
+ $Page->handler = $Page->link;
+ $Page->link .= "/$title";
+ $row = $Db->query(
+ 'SELECT * FROM comments WHERE id = ?', [$title]
+ )->fetch();
+ if (!$row) throw new Exception('Antwoordnummer niet gevonden');
- $Page->title .= ': '.htmlspecialchars($Issue->subject);
+ print "
{$Page->title}
\n";
+ printf('\n";
+ return;
+ }
+
+ $replies = $Page->widget('reply'); # handle updates
$Page->body = $replies; # find image
if ($Page->api) return;
@@ -44,7 +66,10 @@ if ($Page->api) return;
if ($_POST and isset($_POST['subject'])) {
require_once 'upload.inc.php';
if (strlen($_POST['subject']) < 2) {
- throw new Exception('Een minimaal onderwerp is verplicht om een issue aan te maken.');
+ throw new Exception('Vul een onderwerp in om de issue te kunnen benoemen.');
+ }
+ if (!preg_match('/\S/', $_POST['reply'])) {
+ throw new Exception('Een korte beschrijving is verplicht om een issue aan te maken.');
}
$query = $Db->set('issues', [
'page' => $Page->handler,
@@ -59,14 +84,11 @@ if ($_POST and isset($_POST['subject'])) {
if (!$row->id) {
throw new Exception('Issue niet goed opgeslagen.');
}
- $query = $Db->set('comments', [
- 'page' => "{$Page->handler}/{$row->id}",
- 'raw' => $_POST['body'],
- 'message' => messagehtml($_POST['body']),
- 'author' => $User->login,
- ]);
- if (!$query->rowCount()) {
- throw new Exception('Issueinhoud niet opgeslagen.');
+ try {
+ createcomment($_POST, $row);
+ }
+ catch (Exception $e) {
+ throw new Exception("Issueinhoud niet opgeslagen: {$e->getMessage()}.");
}
$_POST = [];
}
@@ -78,7 +100,7 @@ $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';
+$sql .= ' ORDER BY updated DESC';
$query = $Db->query($sql, [$Page->handler]);
if ($id == 'feed') {
@@ -86,6 +108,16 @@ if ($id == 'feed') {
}
ob_start();
+$stats = $Db->query(
+ "SELECT count(*) AS total, count(closed) AS closed FROM issues"
+)->fetch();
+printf("%s, %s opgelost
\n",
+ showlink(
+ sprintf('%d lopende zaken', $stats->total - $stats->closed),
+ isset($_GET['open']) ? FALSE : '?open'
+ ),
+ $stats->closed
+);
print '';
while ($row = $query->fetch()) {
printf('