X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/fac6ba761f971deb77a5686ead99ec6534f931d2..2ffefa0117565475a16a12fef01c8b6fb83824bd:/widget/reply.php?ds=inline

diff --git a/widget/reply.php b/widget/reply.php
index ab04137..53fe34f 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -2,7 +2,9 @@
 global $User, $Db, $Issue;
 require_once 'database.inc.php';
 
-print '<h3>Reacties</h3>'."\n";
+$journalcol = [
+	'assign' => 'Toegewezen aan',
+];
 
 if ($_POST) {
 	try {
@@ -20,7 +22,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;
 			}
@@ -54,7 +56,8 @@ if ($_POST) {
 	}
 }
 
-$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]);
 
 print '<ul class="replies">';
 
@@ -65,6 +68,27 @@ while ($row = $query->fetch()) {
 		$rowuser->html, showdate(preg_split('/\D/', $row->created))
 	);
 	printf("<blockquote>%s</blockquote>\n", $row->message);
+	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 (<strike>%s</strike>)' :
+						'gewijzigd van <q>%s</q> naar <q>%s</q>'),
+						$change->old_value, $change->value
+					)
+				);
+			}
+			print "</li>\n";
+		}
+		print "</ul>\n";
+	}
 	print "</li>\n";
 }
 
@@ -77,7 +101,7 @@ if ($User) {
 			'<label for="%s">%s:</label> '
 			. '<input id="%1$s" name="%1$s" value="%s" />'."\n",
 			'assign',
-			'Toegewezen aan',
+			$journalcol['assign'],
 			htmlspecialchars($Issue->assign ?? '')
 		);
 		printf(