X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/084f4a795fb5874eecd7b17b3999f716432ad41c..e2e6d4c1c37aff2e6b50331cb31af9d59536624f:/widget/reply.php

diff --git a/widget/reply.php b/widget/reply.php
index 4d504bb..9761cf2 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -1,9 +1,7 @@
 <?php
-global $User, $Db;
+global $User, $Db, $Issue;
 require_once 'database.inc.php';
 
-print '<h3>Reacties</h3>'."\n";
-
 if ($_POST) {
 	try {
 		$html = nl2br(htmlspecialchars($_POST['reply']));
@@ -16,9 +14,36 @@ if ($_POST) {
 		if (!$query->rowCount()) {
 			throw new Exception('Fout bij opslaan');
 		}
-		if (@list ($cat, $issue) = explode('/', $Page) and ctype_digit($issue)) {
-			$row = ['updated' => ['now()']];
-			$Db->set('issues', $row, ['page = ? AND id = ?', $cat, $issue]);
+		$newcomment = $Db->dbh->lastInsertId('comments_id_seq');
+
+		if (isset($Issue)) {
+			$row = [];
+			foreach (['assign'] 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;
 	}
@@ -44,6 +69,26 @@ while ($row = $query->fetch()) {
 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',
+			'Toegewezen aan',
+			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}",