reply: identify textual journal columns

[minimedit.git] / widget / reply.php

diff --git a/widget/reply.php b/widget/reply.php
index 328a58fbe1a23f2cb8ba09d1b06f3a5480acd691..879b53d248317faa662e9ae66184260fa84188ce 100644 (file)
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -2,7 +2,9 @@
 global $User, $Db, $Issue;
 require_once 'database.inc.php';
 
-print '<h3>Reacties</h3>'."\n";
+$journalcol = [
+       'assign' => 'Toegewezen aan',
+];
 
 if ($_POST) {
        try {
@@ -16,10 +18,11 @@ if ($_POST) {
                if (!$query->rowCount()) {
                        throw new Exception('Fout bij opslaan');
                }
+               $newcomment = $Db->dbh->lastInsertId('comments_id_seq');
 
                if (isset($Issue)) {
-                       $row = ['updated' => ['now()']];
-                       foreach (['assign'] as $col) {
+                       $row = [];
+                       foreach (array_keys($journalcol) as $col) {
                                if (!isset($_POST[$col])) continue;
                                $row[$col] = $_POST[$col] ?: NULL;
                        }
@@ -29,7 +32,22 @@ if ($_POST) {
                                        $row['closed'] = $reset ? ['now()'] : NULL;
                                }
                        }
-                       $Db->set('issues', $row, ['id = ?', $Issue->id]);
+                       $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;
        }
@@ -61,7 +79,7 @@ if ($User) {
                        '<label for="%s">%s:</label> '
                        . '<input id="%1$s" name="%1$s" value="%s" />'."\n",
                        'assign',
-                       'Toegewezen aan',
+                       $journalcol['assign'],
                        htmlspecialchars($Issue->assign ?? '')
                );
                printf(