X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/3a4f1ae1a32baa3658d54c3dadf268bab01308a2..7c9537015a7361681323e5a5ce2f10d9c0ee42d3:/widget/reply.php?ds=sidebyside

diff --git a/widget/reply.php b/widget/reply.php
index 9e1c7e3..0935567 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -9,9 +9,20 @@ $journalcol = [
 if ($_POST) {
 	require_once 'upload.inc.php';
 	try {
+		$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' => messagehtml($_POST['reply']),
+			'page'    => $Page->link,
+			'message' => $html,
 			'author'  => $User->login,
 		]);
 		if (!$query->rowCount()) {
@@ -49,21 +60,27 @@ if ($_POST) {
 				$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";
 	}
 }
 
 $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]);
+$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))
 	);
@@ -79,7 +96,7 @@ while ($row = $query->fetch()) {
 				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>)' :
+						(!isset($change->value) ? 'verwijderd (<s>%s</s>)' :
 						'gewijzigd van <q>%s</q> naar <q>%s</q>'),
 						$change->old_value, $change->value
 					)
@@ -92,10 +109,10 @@ while ($row = $query->fetch()) {
 	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> '
@@ -115,13 +132,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";