issue: store main description as comment row

[minimedit.git] / widget / reply.php

diff --git a/widget/reply.php b/widget/reply.php
index a3b8052a6e7c5ad4a6794ffc6ad5b1acf07a2c3a..66e958746b6f71bb330b4165ff138446c6178021 100644 (file)
--- 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,19 +22,19 @@ if ($_POST) {
                        }
                        $target .= '/' . $User->login;
                        if ($result = userupload($_FILES['image'], $target)) {
+                               $reply['raw'] .= "/$result";
                                if (preg_match('(^image/)', $_FILES['image']['type'])) {
-                                       $html .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
+                                       $reply['message'] .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
                                }
                                else {
-                                       $html .= sprintf('<p>Bijgevoegd bestand: <a href="/%s" />%s</a></p>',
+                                       $reply['message'] .= sprintf('<p>Bijgevoegd bestand: <a href="/%s" />%s</a></p>',
                                                $result, basename($result)
                                        );
                                }
                        }
                }
-               $query = $Db->set('comments', [
+               $query = $Db->set('comments', $reply + [
                        'page'    => $Page->link,
-                       'message' => $html,
                        'author'  => $User->login,
                ]);
                if (!$query->rowCount()) {
@@ -83,15 +88,26 @@ if ($_POST) {
 $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]);
 
+if ($row = $query->fetch()) {
+       print $row->message;
+       $Page->teaser = $row->raw;
+}
+
 print '<ul class="replies">';
 
+$imagecount = 0;
 while ($row = $query->fetch()) {
        $rowuser = new User("profile/{$row->author}");
        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) {