X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/fc5ac7212dade29d2d12ddad934c1dcfe4653794..ed1cd294e32647b117688b25a465889e4664fe03:/widget/reply.php

diff --git a/widget/reply.php b/widget/reply.php
index 328a58f..b740c2a 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -1,67 +1,80 @@
 <?php
 global $User, $Db, $Issue;
 require_once 'database.inc.php';
-
-print '<h3>Reacties</h3>'."\n";
+require_once 'upload.inc.php';
 
 if ($_POST) {
 	try {
-		$html = nl2br(htmlspecialchars($_POST['reply']));
-		$html = "<p>$html</p>";
-		$query = $Db->set('comments', [
-			'page'    => $Page,
-			'message' => $html,
-			'author'  => $User->login,
-		]);
-		if (!$query->rowCount()) {
-			throw new Exception('Fout bij opslaan');
-		}
-
-		if (isset($Issue)) {
-			$row = ['updated' => ['now()']];
-			foreach (['assign'] as $col) {
-				if (!isset($_POST[$col])) continue;
-				$row[$col] = $_POST[$col] ?: NULL;
-			}
-			if (isset($_POST['status'])) {
-				$reset = !empty($_POST['status']);
-				if (isset($Issue->closed) !== $reset) {
-					$row['closed'] = $reset ? ['now()'] : NULL;
-				}
-			}
-			$Db->set('issues', $row, ['id = ?', $Issue->id]);
-		}
+		$newcomment = createcomment($_POST, $Issue);
+		$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 "<p class=warn>Antwoord niet opgeslagen: {$e->getMessage()}.</p>\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]);
+
+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>%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) {
+			print '<li>';
+			if ($change->col == 'closed') {
+				printf('<em>%s</em>', isset($change->value) ? 'Gesloten' : 'Heropend');
+			}
+			else {
+				printf("<em>%s</em> %s",
+					$journalcol[$change->col], sprintf(
+						!isset($change->old_value) ? 'gewijzigd naar <q>%2$s</q>' :
+						(!isset($change->value) ? 'verwijderd (<s>%s</s>)' :
+						'gewijzigd van <q>%s</q> naar <q>%s</q>'),
+						$change->old_value, $change->value
+					)
+				);
+			}
+			print "</li>\n";
+		}
+		print "</ul>\n";
+	}
 	print "</li>\n";
 }
 
-if ($User) {
+if ($User->login) {
 	print '<li>';
-	print '<form method="post" action="">';
-	if (isset($Issue) and $User->admin("edit $Page")) {
+	print '<form method="post" action="" enctype="multipart/form-data">';
+	if (isset($Issue) and $User->admin("edit {$Page->link}")) {
 		print '<p>';
 		printf(
 			'<label for="%s">%s:</label> '
 			. '<input id="%1$s" name="%1$s" value="%s" />'."\n",
 			'assign',
-			'Toegewezen aan',
+			$journalcol['assign'],
 			htmlspecialchars($Issue->assign ?? '')
 		);
 		printf(
@@ -75,13 +88,22 @@ if ($User) {
 		);
 		print "</p>\n";
 	}
+	if (isset($Issue)) {
+		printf(
+			'<p><label for="%s">%s:</label> '
+			. '<input id="%1$s" name="%1$s" value=""%s /></p>'."\n",
+			'image', 'Beeldmateriaal', ' type="file" accept="image/*"'
+		);
+	}
 	printf('<textarea id="%s" name="%1$s" cols=60 rows=3 placeholder="%s">%s</textarea>'."\n",
 		'reply',
 		"Bericht van {$User->login}",
 		''
 	);
 	print '<input type="submit" value="Plaatsen" />'."\n";
-	print "</form></li>\n";
+	print "</form>";
+	print '<script src="/upload/progress.js"></script>';
+	print "</li>\n";
 }
 
 print "</ul>\n\n";