$journalcol = [
'assign' => 'Toegewezen aan',
+ 'subject' => 'Onderwerp',
];
if ($_POST) {
require_once 'upload.inc.php';
try {
- $html = messagehtml($_POST['reply']);
+ $reply = [];
+ if (isset($_POST['reply']) and $body = $_POST['reply']) {
+ $reply['raw'] = $body;
+ $reply['message'] = messagehtml($body);
+ }
if ($_FILES and !empty($_FILES['image'])) {
$target = 'data/upload';
if (!file_exists($target)) {
}
$target .= '/' . $User->login;
if ($result = userupload($_FILES['image'], $target)) {
- $html .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
+ $reply['raw'] .= "/$result";
+ if (preg_match('(^image/)', $_FILES['image']['type'])) {
+ $reply['message'] .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
+ }
+ else {
+ $reply['message'] .= sprintf('<p>Bijgevoegd bestand: <a href="/%s" />%s</a></p>',
+ $result, basename($result)
+ );
+ }
}
}
- $query = $Db->set('comments', [
- 'page' => $Page,
- 'message' => $html,
+ $query = $Db->set('comments', $reply + [
+ 'page' => $Page->link,
'author' => $User->login,
]);
if (!$query->rowCount()) {
$Issue = $updated;
}
}
+
+ $target = "/{$Page->link}/$newcomment#$newcomment";
+ abort($target, ($Page->api ? 200 : 303) . ' reply success');
$_POST['reply'] = NULL;
}
catch (Exception $e) {
+ if ($Page->api) {
+ abort(ucfirst($e->getMessage()), '500 reply error');
+ }
print "<p class=warn>Antwoord niet opgeslagen: {$e->getMessage()}.</p>\n\n";
}
}
$cols = '*, (SELECT json_agg(journal.*) FROM journal WHERE comment_id = comments.id) AS journal';
-$query = $Db->query("SELECT $cols FROM comments WHERE page = ? ORDER BY created", [$Page]);
+$query = $Db->query("SELECT $cols FROM comments WHERE page = ? ORDER BY created", [$Page->link]);
print '<ul class="replies">';
+$imagecount = 0;
while ($row = $query->fetch()) {
$rowuser = new User("profile/{$row->author}");
- print '<li>';
+ printf('<li id="%d">', $row->id);
printf('<strong>%s</strong> <small class=date>%s</small>',
$rowuser->html, showdate(preg_split('/\D/', $row->created))
);
- printf("<blockquote>\n%s</blockquote>\n", $row->message);
+ if ($html = $row->message) {
+ $html = preg_replace('/(?<=<img )/',
+ $imagecount > 2 ? 'loading="lazy" ' : '', $html, -1, $found);
+ $imagecount += $found;
+ printf("<blockquote>\n%s</blockquote>\n", $html);
+ }
if ($changes = json_decode($row->journal)) {
print '<ul>';
foreach ($changes as $change) {
printf("<em>%s</em> %s",
$journalcol[$change->col], sprintf(
!isset($change->old_value) ? 'gewijzigd naar <q>%2$s</q>' :
- (!isset($change->value) ? 'verwijderd (<strike>%s</strike>)' :
+ (!isset($change->value) ? 'verwijderd (<s>%s</s>)' :
'gewijzigd van <q>%s</q> naar <q>%s</q>'),
$change->old_value, $change->value
)
if ($User->login) {
print '<li>';
print '<form method="post" action="" enctype="multipart/form-data">';
- if (isset($Issue) and $User->admin("edit $Page")) {
+ if (isset($Issue) and $User->admin("edit {$Page->link}")) {
print '<p>';
printf(
'<label for="%s">%s:</label> '
''
);
print '<input type="submit" value="Plaatsen" />'."\n";
- print "</form></li>\n";
+ print "</form>";
+ print '<script src="/upload/progress.js"></script>';
+ print "</li>\n";
}
print "</ul>\n\n";