X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/fc5ac7212dade29d2d12ddad934c1dcfe4653794..cc9044a1aa3f79cda743040573d49bc71fb7805f:/widget/reply.php
diff --git a/widget/reply.php b/widget/reply.php
index 328a58f..685a611 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -2,24 +2,49 @@
global $User, $Db, $Issue;
require_once 'database.inc.php';
-print '
Reacties
'."\n";
+$journalcol = [
+ 'assign' => 'Toegewezen aan',
+ 'subject' => 'Onderwerp',
+];
if ($_POST) {
+ require_once 'upload.inc.php';
try {
- $html = nl2br(htmlspecialchars($_POST['reply']));
- $html = "$html
";
- $query = $Db->set('comments', [
- 'page' => $Page,
- 'message' => $html,
+ $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)) {
+ throw new Exception("er is geen uploadmap aanwezig op $target");
+ }
+ $target .= '/' . $User->login;
+ if ($result = userupload($_FILES['image'], $target)) {
+ $reply['raw'] .= "/$result";
+ if (preg_match('(^image/)', $_FILES['image']['type'])) {
+ $reply['message'] .= sprintf('![](/thumb/640x/%s)
', $result);
+ }
+ else {
+ $reply['message'] .= sprintf('Bijgevoegd bestand: %s
',
+ $result, basename($result)
+ );
+ }
+ }
+ }
+ $query = $Db->set('comments', $reply + [
+ 'page' => $Page->link,
'author' => $User->login,
]);
if (!$query->rowCount()) {
throw new Exception('Fout bij opslaan');
}
+ $newcomment = $Db->dbh->lastInsertId('comments_id_seq');
if (isset($Issue)) {
- $row = ['updated' => ['now()']];
- foreach (['assign'] as $col) {
+ $row = [];
+ foreach (array_keys($journalcol) as $col) {
if (!isset($_POST[$col])) continue;
$row[$col] = $_POST[$col] ?: NULL;
}
@@ -29,39 +54,89 @@ if ($_POST) {
$row['closed'] = $reset ? ['now()'] : NULL;
}
}
- $Db->set('issues', $row, ['id = ?', $Issue->id]);
+ $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,
+ ]);
+ }
+ $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 "Antwoord niet opgeslagen: {$e->getMessage()}.
\n\n";
}
}
-$query = $Db->query('SELECT * FROM comments WHERE page = ? ORDER BY created', [$Page]);
+$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->link]);
print '';
+$imagecount = 0;
while ($row = $query->fetch()) {
$rowuser = new User("profile/{$row->author}");
- print '- ';
+ printf('
- ', $row->id);
printf('%s %s',
$rowuser->html, showdate(preg_split('/\D/', $row->created))
);
- printf("
%s
\n", $row->message);
+ if ($html = $row->message) {
+ $html = preg_replace('/(?<=
2 ? 'loading="lazy" ' : '', $html, -1, $found);
+ $imagecount += $found;
+ printf("\n%s
\n", $html);
+ }
+ if ($changes = json_decode($row->journal)) {
+ print '';
+ foreach ($changes as $change) {
+ print '- ';
+ if ($change->col == 'closed') {
+ printf('%s', isset($change->value) ? 'Gesloten' : 'Heropend');
+ }
+ else {
+ printf("%s %s",
+ $journalcol[$change->col], sprintf(
+ !isset($change->old_value) ? 'gewijzigd naar
%2$s
' :
+ (!isset($change->value) ? 'verwijderd (%s)' :
+ 'gewijzigd van %s
naar %s
'),
+ $change->old_value, $change->value
+ )
+ );
+ }
+ print " \n";
+ }
+ print "
\n";
+ }
print " \n";
}
-if ($User) {
+if ($User->login) {
print '- ';
- print '
\n";
+ print "";
+ print '';
+ print "\n";
}
print "
\n\n";