X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/fac6ba761f971deb77a5686ead99ec6534f931d2..621fc2f9638a1a92aa8535310e7852de5542f11e:/widget/reply.php

diff --git a/widget/reply.php b/widget/reply.php
index ab04137..edffaa7 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -2,12 +2,24 @@
 global $User, $Db, $Issue;
 require_once 'database.inc.php';
 
-print '<h3>Reacties</h3>'."\n";
+$journalcol = [
+	'assign' => 'Toegewezen aan',
+];
 
 if ($_POST) {
+	require_once 'upload.inc.php';
 	try {
-		$html = nl2br(htmlspecialchars($_POST['reply']));
-		$html = "<p>$html</p>";
+		$html = messagehtml($_POST['reply']);
+		if ($_FILES and !empty($_FILES['image'])) {
+			$target = 'data/upload';
+			if (!file_exists($target)) {
+				throw new Exception("er is geen uploadmap aanwezig op $target");
+			}
+			$target .= '/' . $User->login;
+			if ($result = userupload($_FILES['image'], $target)) {
+				$html .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
+			}
+		}
 		$query = $Db->set('comments', [
 			'page'    => $Page,
 			'message' => $html,
@@ -20,7 +32,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;
 			}
@@ -45,6 +57,7 @@ if ($_POST) {
 						'value'      => $updated->$col,
 					]);
 				}
+				$Issue = $updated;
 			}
 		}
 		$_POST['reply'] = NULL;
@@ -54,7 +67,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">';
 
@@ -64,20 +78,41 @@ while ($row = $query->fetch()) {
 	printf('<strong>%s</strong> <small class=date>%s</small>',
 		$rowuser->html, showdate(preg_split('/\D/', $row->created))
 	);
-	printf("<blockquote>%s</blockquote>\n", $row->message);
+	printf("<blockquote>\n%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";
 }
 
-if ($User) {
+if ($User->login) {
 	print '<li>';
-	print '<form method="post" action="">';
+	print '<form method="post" action="" enctype="multipart/form-data">';
 	if (isset($Issue) and $User->admin("edit $Page")) {
 		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(
@@ -91,6 +126,13 @@ 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}",