X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/390f24390894684c6f6d4f70261883e6d828502d..a7cf507fa0aa8b275979dbe98d3d0ef34fa7f05a:/widget/reply.php

diff --git a/widget/reply.php b/widget/reply.php
index 3984349..0a0e4e5 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -4,6 +4,7 @@ require_once 'database.inc.php';
 
 $journalcol = [
 	'assign' => 'Toegewezen aan',
+	'subject' => 'Onderwerp',
 ];
 
 if ($_POST) {
@@ -17,11 +18,18 @@ if ($_POST) {
 			}
 			$target .= '/' . $User->login;
 			if ($result = userupload($_FILES['image'], $target)) {
-				$html .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
+				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,
 		]);
@@ -60,21 +68,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))
 	);
@@ -106,7 +120,7 @@ while ($row = $query->fetch()) {
 if ($User->login) {
 	print '<li>';
 	print '<form method="post" action="" enctype="multipart/form-data">';
-	if (isset($Issue) and $User->admin("edit $Page")) {
+	if (isset($Issue) and $User->admin("edit {$Page->link}")) {
 		print '<p>';
 		printf(
 			'<label for="%s">%s:</label> '
@@ -139,7 +153,9 @@ if ($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";