X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/fac6ba761f971deb77a5686ead99ec6534f931d2..52aab71e2268171618efe0f8f8e683b9bc5406f6:/widget/reply.php?ds=inline diff --git a/widget/reply.php b/widget/reply.php index ab04137..685a611 100644 --- a/widget/reply.php +++ b/widget/reply.php @@ -2,15 +2,39 @@ global $User, $Db, $Issue; require_once 'database.inc.php'; -print '
$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('', $result); + } + else { + $reply['message'] .= sprintf('', + $result, basename($result) + ); + } + } + } + $query = $Db->set('comments', $reply + [ + 'page' => $Page->link, 'author' => $User->login, ]); if (!$query->rowCount()) { @@ -20,7 +44,7 @@ if ($_POST) { if (isset($Issue)) { $row = []; - foreach (['assign'] as $col) { + foreach (array_keys($journalcol) as $col) { if (!isset($_POST[$col])) continue; $row[$col] = $_POST[$col] ?: NULL; } @@ -45,39 +69,74 @@ if ($_POST) { '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 '%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 '
%2$s' : + (!isset($change->value) ? 'verwijderd (
%snaar
%s'), + $change->old_value, $change->value + ) + ); + } + print "