if ($_POST) {
try {
$newcomment = createcomment($_POST, $Issue);
- $target = "/{$Page->link}/$newcomment#$newcomment";
+ $target = "/{$Page->link}?last=$newcomment#$newcomment";
abort($target, ($Page->api ? 200 : 303) . ' reply success');
$_POST['reply'] = NULL;
}
if ($Page->api) {
abort(ucfirst($e->getMessage()), '500 reply error');
}
- print "<p class=warn>Antwoord niet opgeslagen: {$e->getMessage()}.</p>\n\n";
+ printf("<p class=warn>Antwoord niet opgeslagen: %s.</p>\n\n",
+ nl2br(htmlspecialchars($e->getMessage()))
+ );
}
}
-$cols = '*, (SELECT json_agg(journal.*) FROM journal WHERE comment_id = comments.id) AS journal';
+$cols = "*, (SELECT json_agg(journal.*) FROM journal WHERE comment_id = comments.id AND property = 'attr') AS journal";
$query = $Db->query("SELECT $cols FROM comments WHERE page = ? ORDER BY created", [$Page->link]);
if ($row = $query->fetch()) {
$Page->teaser = $row->raw;
}
-print '<ul class="replies">';
+print '<section class="replies">';
$imagecount = 0;
while ($row = $query->fetch()) {
$rowuser = new User("profile/{$row->author}");
- printf('<li id="%d">', $row->id);
- printf('<strong>%s</strong> <small class=date>%s</small>',
- $rowuser->html, showdate(preg_split('/\D/', $row->created))
- );
+ printf('<article id="%d">', $row->id);
+ printf('<strong>%s</strong>', $rowuser->html);
+ $rowdate = showdate(preg_split('/\D/', $row->created));
+ if ($User->admin('beheer') and $row->updated) {
+ $rowdate = "<s>$rowdate</s> " . showdate(preg_split('/\D/', $row->updated));
+ }
+ printf(' <small class=date>%s</small>', $rowdate);
+ if ($User->admin('beheer') and $User->admin('user') || $User->login === $row->author) {
+ printf(' <a href="%s" title="%s" class=icon>%s</a>',
+ "/{$Page->link}/{$row->id}", 'reactie aanpassen', "\u{270D}");
+ }
if ($html = $row->message) {
$html = preg_replace('/(?<=<img )/',
$imagecount > 2 ? 'loading="lazy" ' : '', $html, -1, $found);
}
print "</ul>\n";
}
- print "</li>\n";
+ print "</article>\n";
}
if ($User->login) {
- print '<li>';
+ print '<article><hr />';
print '<form method="post" action="" enctype="multipart/form-data">';
if (isset($Issue) and $User->admin("edit {$Page->link}")) {
+ print "<aside>\n";
+ print '<p>';
+ printf(
+ '<label for="%s">%s:</label> '
+ . '<input id="%1$s" name="%1$s" value="%s" />'."\n",
+ 'subject',
+ $journalcol['subject'],
+ htmlspecialchars($Issue->subject ?? '')
+ );
+ print "</p>\n";
+
print '<p>';
printf(
'<label for="%s">%s:</label> '
'Gesloten'
);
print "</p>\n";
+ print "</aside>\n";
+ }
+ {
+ print '<p>';
+ printf(
+ '<input type="hidden" name="%s" value="" />'
+ . "Geplaatste berichten zijn hier direct zichtbaar voor bewoners.\n"
+ . '<input type="checkbox" id="%1$s" name="%1$s" value="%s"%s%s />'
+ . '<label for="%1$s"> %s</label>'."\n",
+ 'announce',
+ '1',
+ ($_POST['announce'] ?? TRUE) ? ' checked' : '',
+ ' onclick="this.nextSibling.hidden = !this.checked"',
+ "De eerste regel wordt ook weergegeven op het scherm in de hal."
+ );
+ print "</p>\n";
}
if (isset($Issue)) {
printf(
print '<input type="submit" value="Plaatsen" />'."\n";
print "</form>";
print '<script src="/upload/progress.js"></script>';
- print "</li>\n";
+ print "</article>\n";
}
-print "</ul>\n\n";
+print "</section>\n\n";