issue: require message contents

diff --git a/issue/index.php b/issue/index.php
index 55ea273285b71128ccaa24e7f501d3707b600406..df1aa6869c0511e57fafe1c7c3b5053cd3fbeac4 100644 (file)
--- 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 77fa846aebd59057df1dd9c7caf7445d17a3ef0e..f2e101a3a9faa4d412eb28c0e42d3778a30ea076 100644 (file)
--- 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'];