<?php
global $User, $Db, $Issue;
require_once 'database.inc.php';
-
-$journalcol = [
- 'assign' => 'Toegewezen aan',
-];
+require_once 'upload.inc.php';
if ($_POST) {
- require_once 'upload.inc.php';
try {
- $query = $Db->set('comments', [
- 'page' => $Page,
- 'message' => messagehtml($_POST['reply']),
- 'author' => $User->login,
- ]);
- if (!$query->rowCount()) {
- throw new Exception('Fout bij opslaan');
- }
- $newcomment = $Db->dbh->lastInsertId('comments_id_seq');
-
- if (isset($Issue)) {
- $row = [];
- foreach (array_keys($journalcol) as $col) {
- if (!isset($_POST[$col])) continue;
- $row[$col] = $_POST[$col] ?: NULL;
- }
- if (isset($_POST['status'])) {
- $reset = !empty($_POST['status']);
- if (isset($Issue->closed) !== $reset) {
- $row['closed'] = $reset ? ['now()'] : NULL;
- }
- }
- $derived = ['updated' => ['now()']];
- $filter = ['id = ? RETURNING *', $Issue->id];
- $subquery = $Db->set('issues', $row + $derived, $filter);
-
- if ($updated = $subquery->fetch()) {
- foreach (array_keys($row) as $col) {
- if ($updated->$col === $Issue->$col) continue; # unaltered
- $Db->set('journal', [
- 'comment_id' => $newcomment,
- 'property' => 'attr',
- 'col' => $col,
- 'old_value' => $Issue->$col,
- 'value' => $updated->$col,
- ]);
- }
- }
- }
+ $newcomment = createcomment($_POST, $Issue);
+ $target = "/{$Page->link}?last=$newcomment#$newcomment";
+ abort($target, ($Page->api ? 200 : 303) . ' reply success');
$_POST['reply'] = NULL;
}
catch (Exception $e) {
- print "<p class=warn>Antwoord niet opgeslagen: {$e->getMessage()}.</p>\n\n";
+ if ($Page->api) {
+ abort(ucfirst($e->getMessage()), '500 reply error');
+ }
+ 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';
-$query = $Db->query("SELECT $cols FROM comments WHERE page = ? ORDER BY created", [$Page]);
+$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()) {
+ print $row->message;
+ $Page->teaser = $row->raw;
+}
-print '<ul class="replies">';
+print '<section class="replies">';
+$imagecount = 0;
while ($row = $query->fetch()) {
$rowuser = new User("profile/{$row->author}");
- print '<li>';
- printf('<strong>%s</strong> <small class=date>%s</small>',
- $rowuser->html, showdate(preg_split('/\D/', $row->created))
- );
- printf("<blockquote>%s</blockquote>\n", $row->message);
+ 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);
+ $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
)
}
print "</ul>\n";
}
- print "</li>\n";
+ print "</article>\n";
}
-if ($User) {
- print '<li>';
- print '<form method="post" action="">';
- if (isset($Issue) and $User->admin("edit $Page")) {
+if ($User->login) {
+ 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(
+ '<p><label for="%s">%s:</label> '
+ . '<input id="%1$s" name="%1$s" value=""%s /></p>'."\n",
+ 'image', 'Beeldmateriaal', ' type="file" accept="image/*"'
+ );
}
printf('<textarea id="%s" name="%1$s" cols=60 rows=3 placeholder="%s">%s</textarea>'."\n",
'reply',
''
);
print '<input type="submit" value="Plaatsen" />'."\n";
- print "</form></li>\n";
+ print "</form>";
+ print '<script src="/upload/progress.js"></script>';
+ print "</article>\n";
}
-print "</ul>\n\n";
+print "</section>\n\n";
git.shiar.nl / minimedit.git / blobdiff