X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/52aab71e2268171618efe0f8f8e683b9bc5406f6..6bdc514b94fb0127159c809e8f311cccc230d4ee:/upload.inc.php
diff --git a/upload.inc.php b/upload.inc.php
index 4f5c5fe..962bedc 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -1,4 +1,10 @@
'Toegewezen aan',
+ 'subject' => 'Onderwerp',
+];
+
function userupload($input, $target = NULL, $filename = NULL)
{
switch ($input['error']) {
@@ -48,7 +54,7 @@ function messagehtml($input)
if (empty($input)) {
return;
}
- if ($User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
+ if ($User and $User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
return $input; # allow html input as is if privileged
}
$markup = [
@@ -57,12 +63,130 @@ function messagehtml($input)
'{<([^>\s|]+)[\s|]([^>]+)>}' => '$2', # hyperlink
"/\r\n?/" => "\n", # unix newlines
"/ +\n/" => "
", # trailing spaces for hard line break
- "/\n/" => "
", # newlines start paragraphs + '{^(/data/.*\.jpe?g)\z}m' => '', # image reference + "/^[-*] (.*)$\n?/m" => '
$1
\n", # paragraph + "{^(
$1
', # monospace
];
- $html = preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input));
- return "$html
"; + return preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input)); +} + +function createcomment($input, &$Issue = NULL) +{ + # insert user message as database issue/reply + global $User, $Db, $Page, $journalcol; + + $reply = []; + if (isset($input['reply']) and $body = $input['reply']) { + $reply['raw'] = $body; + $reply['message'] = messagehtml($body); + } + 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)) { + $reply['raw'] = $reply['raw'] ?? ''; + $reply['raw'] .= "/$result"; + $reply['message'] = $reply['message'] ?? ''; + if (preg_match('(^image/)', $_FILES['image']['type'])) { + $reply['message'] .= sprintf('', $result); + } + else { + $reply['message'] .= sprintf('', + $result, basename($result) + ); + } + } + } + if (!$reply) { + throw new Exception("lege inhoud"); + } + if (isset($input['announce'])) { + $reply['announced'] = !!$input['announce']; + } + + if (isset($input['id'])) { + $newcomment = $input['id']; + $filter = ['id = ?', $newcomment]; + $oldcomment = $Db->query("SELECT * FROM comments WHERE $filter[0]", [$filter[1]])->fetch(); + if (empty($oldcomment)) { + throw new Exception('Antwoord niet gevonden'); + } + + $reply += [ + 'updated' => ['now()'], + ]; + $query = $Db->set('comments', $reply, $filter); + if (!$query->rowCount()) { + throw new Exception('Fout bij aanpassen'); + } + + if ($updated = $query->fetch()) { + foreach (array_keys(get_object_vars($updated)) as $col) { + if ($updated->$col === $oldcomment->$col) { + continue; # unaltered + } + $Db->set('journal', [ + 'comment_id' => $newcomment, + 'property' => 'col', + 'col' => $col, + 'old_value' => $oldcomment->$col, + 'value' => $updated->$col, + ]); + } + } + } + else { + $reply += [ + 'page' => "{$Page->handler}/{$Issue->id}", + 'author' => $User->login, + ]; + $query = $Db->set('comments', $reply); + 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($input[$col])) continue; + $row[$col] = $input[$col] ?: NULL; + } + if (isset($input['status'])) { + $reset = !empty($input['status']); + if (isset($Issue->closed) !== $reset) { + $row['closed'] = $reset ? ['now()'] : NULL; + } + } + $derived = ['updated' => ['now()']]; + $filter = ['id = ?', $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, + ]); + } + $Issue = $updated; + } + } + + return $newcomment; }