reply: identify textual journal columns

[minimedit.git] / widget / reply.php

diff --git a/widget/reply.php b/widget/reply.php
index 3a16e2c0df1d3d54d1c10a255e9ace49a8edb44c..879b53d248317faa662e9ae66184260fa84188ce 100644 (file)
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -1,14 +1,16 @@
 <?php
-global $User;
+global $User, $Db, $Issue;
 require_once 'database.inc.php';
 
-print '<h3>Reacties</h3>'."\n";
+$journalcol = [
+       'assign' => 'Toegewezen aan',
+];
 
 if ($_POST) {
        try {
                $html = nl2br(htmlspecialchars($_POST['reply']));
                $html = "<p>$html</p>";
-               $query = $Db->insert('comments', [
+               $query = $Db->set('comments', [
                        'page'    => $Page,
                        'message' => $html,
                        'author'  => $User->login,
@@ -16,10 +18,41 @@ if ($_POST) {
                if (!$query->rowCount()) {
                        throw new Exception('Fout bij opslaan');
                }
+               $newcomment = $Db->dbh->lastInsertId('comments_id_seq');
+
+               if (isset($Issue)) {
+                       $row = [];
+                       foreach (array_keys($journalcol) as $col) {
+                               if (!isset($_POST[$col])) continue;
+                               $row[$col] = $_POST[$col] ?: NULL;
+                       }
+                       if (isset($_POST['status'])) {
+                               $reset = !empty($_POST['status']);
+                               if (isset($Issue->closed) !== $reset) {
+                                       $row['closed'] = $reset ? ['now()'] : NULL;
+                               }
+                       }
+                       $derived = ['updated' => ['now()']];
+                       $filter = ['id = ? RETURNING *', $Issue->id];
+                       $subquery = $Db->set('issues', $row + $derived, $filter);
+
+                       if ($updated = $subquery->fetch()) {
+                               foreach (array_keys($row) as $col) {
+                                       if ($updated->$col === $Issue->$col) continue; # unaltered
+                                       $Db->set('journal', [
+                                               'comment_id' => $newcomment,
+                                               'property'   => 'attr',
+                                               'col'        => $col,
+                                               'old_value'  => $Issue->$col,
+                                               'value'      => $updated->$col,
+                                       ]);
+                               }
+                       }
+               }
                $_POST['reply'] = NULL;
        }
        catch (Exception $e) {
-               print '<p class=warn>Antwoord niet opgeslagen.</p>'."\n\n";
+               print "<p class=warn>Antwoord niet opgeslagen: {$e->getMessage()}.</p>\n\n";
        }
 }
 
@@ -37,14 +70,36 @@ while ($row = $query->fetch()) {
        print "</li>\n";
 }
 
-print '<li>';
-print '<form method="post" action="">';
-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";
+if ($User) {
+       print '<li>';
+       print '<form method="post" action="">';
+       if (isset($Issue) and $User->admin("edit $Page")) {
+               print '<p>';
+               printf(
+                       '<label for="%s">%s:</label> '
+                       . '<input id="%1$s" name="%1$s" value="%s" />'."\n",
+                       'assign',
+                       $journalcol['assign'],
+                       htmlspecialchars($Issue->assign ?? '')
+               );
+               printf(
+                       '<input type="hidden" name="%s" value="" />' .
+                       '<input type="checkbox" id="%1$s" name="%1$s" value="%s"%s />'
+                       . '<label for="%1$s"> %s</label>'."\n",
+                       'status',
+                       'resolved',
+                       isset($Issue->closed) ? ' checked' : '',
+                       'Gesloten'
+               );
+               print "</p>\n";
+       }
+       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 "</ul>\n\n";