From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 5 Nov 2021 16:34:43 +0000 (+0100)
Subject: issue: require message contents
X-Git-Tag: v5.4~9
X-Git-Url: http://git.shiar.nl/minimedit.git/commitdiff_plain/ecfc420d52ce7983a6361ccc7dec24fd46ec2d07

issue: require message contents
---

diff --git a/issue/index.php b/issue/index.php
index 55ea273..df1aa68 100644
--- a/issue/index.php
+++ b/issue/index.php
@@ -66,7 +66,10 @@ if ($Page->api) return;
 if ($_POST and isset($_POST['subject'])) {
 		require_once 'upload.inc.php';
 		if (strlen($_POST['subject']) < 2) {
-			throw new Exception('Een minimaal onderwerp is verplicht om een issue aan te maken.');
+			throw new Exception('Vul een onderwerp in om de issue te kunnen benoemen.');
+		}
+		if (!preg_match('/\S/', $_POST['reply'])) {
+			throw new Exception('Een korte beschrijving is verplicht om een issue aan te maken.');
 		}
 		$query = $Db->set('issues', [
 			'page'    => $Page->handler,
diff --git a/upload.inc.php b/upload.inc.php
index 77fa846..f2e101a 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -84,9 +84,6 @@ function createcomment($input, &$Issue = NULL)
 		$reply['raw'] = $body;
 		$reply['message'] = messagehtml($body);
 	}
-	if (isset($input['announce'])) {
-		$reply['announced'] = !!$input['announce'];
-	}
 	if ($_FILES and !empty($_FILES['image'])) {
 		$target = 'data/upload';
 		if (!file_exists($target)) {
@@ -107,6 +104,12 @@ function createcomment($input, &$Issue = NULL)
 			}
 		}
 	}
+	if (!$reply) {
+		throw new Exception("lege inhoud");
+	}
+	if (isset($input['announce'])) {
+		$reply['announced'] = !!$input['announce'];
+	}
 
 	if (isset($input['id'])) {
 		$newcomment = $input['id'];