issue: populate ticket data before reply include

[minimedit.git] / widget / reply.php

diff --git a/widget/reply.php b/widget/reply.php
index 9761cf2385546dec52f1ef19d610c175d56dbcd3..fd01a947f81acb6748fb300b2bac7f00788216ef 100644 (file)
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -2,13 +2,16 @@
 global $User, $Db, $Issue;
 require_once 'database.inc.php';
 
+$journalcol = [
+       'assign' => 'Toegewezen aan',
+];
+
 if ($_POST) {
+       require_once 'upload.inc.php';
        try {
-               $html = nl2br(htmlspecialchars($_POST['reply']));
-               $html = "<p>$html</p>";
                $query = $Db->set('comments', [
                        'page'    => $Page,
-                       'message' => $html,
+                       'message' => messagehtml($_POST['reply']),
                        'author'  => $User->login,
                ]);
                if (!$query->rowCount()) {
@@ -18,7 +21,7 @@ if ($_POST) {
 
                if (isset($Issue)) {
                        $row = [];
-                       foreach (['assign'] as $col) {
+                       foreach (array_keys($journalcol) as $col) {
                                if (!isset($_POST[$col])) continue;
                                $row[$col] = $_POST[$col] ?: NULL;
                        }
@@ -43,6 +46,7 @@ if ($_POST) {
                                                'value'      => $updated->$col,
                                        ]);
                                }
+                               $Issue = $updated;
                        }
                }
                $_POST['reply'] = NULL;
@@ -52,7 +56,8 @@ if ($_POST) {
        }
 }
 
-$query = $Db->query('SELECT * FROM comments WHERE page = ? ORDER BY created', [$Page]);
+$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]);
 
 print '<ul class="replies">';
 
@@ -63,6 +68,27 @@ while ($row = $query->fetch()) {
                $rowuser->html, showdate(preg_split('/\D/', $row->created))
        );
        printf("<blockquote>%s</blockquote>\n", $row->message);
+       if ($changes = json_decode($row->journal)) {
+               print '<ul>';
+               foreach ($changes as $change) {
+                       print '<li>';
+                       if ($change->col == 'closed') {
+                               printf('<em>%s</em>', isset($change->value) ? 'Gesloten' : 'Heropend');
+                       }
+                       else {
+                               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>)' :
+                                               'gewijzigd van <q>%s</q> naar <q>%s</q>'),
+                                               $change->old_value, $change->value
+                                       )
+                               );
+                       }
+                       print "</li>\n";
+               }
+               print "</ul>\n";
+       }
        print "</li>\n";
 }
 
@@ -75,7 +101,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(