X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/e64861a7760cfe34596e193a6a3ed2ef39b25892..52aab71e2268171618efe0f8f8e683b9bc5406f6:/widget/reply.php?ds=inline diff --git a/widget/reply.php b/widget/reply.php index 1f6d0e2..685a611 100644 --- a/widget/reply.php +++ b/widget/reply.php @@ -4,12 +4,17 @@ require_once 'database.inc.php'; $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)) { @@ -17,12 +22,19 @@ if ($_POST) { } $target .= '/' . $User->login; if ($result = userupload($_FILES['image'], $target)) { - $html .= sprintf('
', $result); + $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', [ + $query = $Db->set('comments', $reply + [ 'page' => $Page->link, - 'message' => $html, 'author' => $User->login, ]); if (!$query->rowCount()) { @@ -61,9 +73,8 @@ if ($_POST) { } } - if ($Page->api) { - abort("/{$Page->link}", '200 reply success'); - } + $target = "/{$Page->link}/$newcomment#$newcomment"; + abort($target, ($Page->api ? 200 : 303) . ' reply success'); $_POST['reply'] = NULL; } catch (Exception $e) { @@ -79,13 +90,19 @@ $query = $Db->query("SELECT $cols FROM comments WHERE page = ? ORDER BY created" print '\n%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 '