X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/e64861a7760cfe34596e193a6a3ed2ef39b25892..05c560470887c86a30c82360d7be5caf0de1baa4:/widget/reply.php

diff --git a/widget/reply.php b/widget/reply.php
index 1f6d0e2..66e9587 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('<p><img src="/thumb/640x/%s" /></p>', $result);
+				$reply['raw'] .= "/$result";
+				if (preg_match('(^image/)', $_FILES['image']['type'])) {
+					$reply['message'] .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
+				}
+				else {
+					$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()) {
@@ -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) {
@@ -77,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}");
-	print '<li>';
+	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) {