X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/dffe1a696198bbbda380d4bf0cc6300a0d1e6748..714373870efc4f371ace2d324530a2354a696da7:/widget/reply.php
diff --git a/widget/reply.php b/widget/reply.php
index 9761cf2..d305fc7 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -2,12 +2,26 @@
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 = "
$html
";
+ $html = messagehtml($_POST['reply']);
+ if ($_FILES and !empty($_FILES['image'])) {
+ $target = 'data/upload';
+ if (!file_exists($target)) {
+ throw new Exception("er is geen uploadmap aanwezig op $target");
+ }
+ $target .= '/' . $User->login;
+ if ($result = userupload($_FILES['image'], $target)) {
+ $html .= sprintf('![](/thumb/640x/%s)
', $result);
+ }
+ }
$query = $Db->set('comments', [
- 'page' => $Page,
+ 'page' => $Page->link,
'message' => $html,
'author' => $User->login,
]);
@@ -18,7 +32,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 +57,7 @@ if ($_POST) {
'value' => $updated->$col,
]);
}
+ $Issue = $updated;
}
}
$_POST['reply'] = NULL;
@@ -52,7 +67,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->link]);
print '';
@@ -62,20 +78,41 @@ while ($row = $query->fetch()) {
printf('%s %s',
$rowuser->html, showdate(preg_split('/\D/', $row->created))
);
- printf("%s
\n", $row->message);
+ printf("\n%s
\n", $row->message);
+ if ($changes = json_decode($row->journal)) {
+ print '';
+ foreach ($changes as $change) {
+ print '- ';
+ if ($change->col == 'closed') {
+ printf('%s', isset($change->value) ? 'Gesloten' : 'Heropend');
+ }
+ else {
+ printf("%s %s",
+ $journalcol[$change->col], sprintf(
+ !isset($change->old_value) ? 'gewijzigd naar
%2$s
' :
+ (!isset($change->value) ? 'verwijderd (%s)' :
+ 'gewijzigd van %s
naar %s
'),
+ $change->old_value, $change->value
+ )
+ );
+ }
+ print " \n";
+ }
+ print "
\n";
+ }
print "\n";
}
-if ($User) {
+if ($User->login) {
print '- ';
- print '