X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/85d01336fad3b3110a6bdb395593e29260714acc..2bed41fd9817049d5f8822e381c4f70cc3bf33c8:/widget/reply.php

diff --git a/widget/reply.php b/widget/reply.php
index cedcc49..ca38ce9 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -10,17 +10,18 @@ if ($_POST) {
 	require_once 'upload.inc.php';
 	try {
 		$html = messagehtml($_POST['reply']);
-		if ($_FILES and isset($_FILES['image'])) {
+		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;
-			$result = userupload($_FILES['image'], $target);
-			$html .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
+			if ($result = userupload($_FILES['image'], $target)) {
+				$html .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
+			}
 		}
 		$query = $Db->set('comments', [
-			'page'    => $Page,
+			'page'    => $Page->handler,
 			'message' => $html,
 			'author'  => $User->login,
 		]);
@@ -67,7 +68,7 @@ if ($_POST) {
 }
 
 $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->handler]);
 
 print '<ul class="replies">';
 
@@ -89,7 +90,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
 					)
@@ -102,10 +103,10 @@ while ($row = $query->fetch()) {
 	print "</li>\n";
 }
 
-if ($User) {
+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->handler}")) {
 		print '<p>';
 		printf(
 			'<label for="%s">%s:</label> '