X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/483761be2d405d4a69c005bd407f12e6d81445b1..d9e768059d2a10c2c5eb5b908a998fb496b4e4cf:/widget/reply.php

diff --git a/widget/reply.php b/widget/reply.php
index 879b53d..0a0e4e5 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -4,14 +4,32 @@ require_once 'database.inc.php';
 
 $journalcol = [
 	'assign' => 'Toegewezen aan',
+	'subject' => 'Onderwerp',
 ];
 
 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)) {
+				if (preg_match('(^image/)', $_FILES['image']['type'])) {
+					$html .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
+				}
+				else {
+					$html .= sprintf('<p>Bijgevoegd bestand: <a href="/%s" />%s</a></p>',
+						$result, basename($result)
+					);
+				}
+			}
+		}
 		$query = $Db->set('comments', [
-			'page'    => $Page,
+			'page'    => $Page->link,
 			'message' => $html,
 			'author'  => $User->login,
 		]);
@@ -47,33 +65,62 @@ if ($_POST) {
 						'value'      => $updated->$col,
 					]);
 				}
+				$Issue = $updated;
 			}
 		}
+
+		$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]);
 
 print '<ul class="replies">';
 
 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);
+	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 (<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> '
@@ -93,13 +140,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";