X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/c7feba44bdf1102b80a09f683321559d18755a24..8e1d3422ac745d49bcf56152f11d5b07ea45cb38:/upload.inc.php?ds=sidebyside
diff --git a/upload.inc.php b/upload.inc.php
index 6175fe2..f2e101a 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']) {
@@ -27,6 +33,9 @@ function userupload($input, $target = NULL, $filename = NULL)
$target .= $input['name'];
}
+ if (file_exists($target)) {
+ throw new Exception("bestandsnaam al aanwezig op $target");
+ }
if (!@move_uploaded_file($input['tmp_name'], $target)) {
throw new Exception("bestand kon niet worden opgeslagen in $target");
}
@@ -45,13 +54,138 @@ 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
}
- $html = preg_replace(
- ["/\r?\n/", "'(?:
\n?){2}'"],
- ["
\n", "
"], - htmlspecialchars($input) - ); - return "
$html
"; + $markup = [ + '{<((?:\w+:|/).+?)>}' => '<$1>', # unescape link entities + '{<(?:https?://)?([^>\s|]+)>}' => '<$1 $1>', # unnamed link + '{<([^>\s|]+)[\s|]([^>]+)>}' => '$2', # hyperlink + "/\r\n?/" => "\n", # unix newlines + "/ +\n/" => "$1
\n", # paragraph + "{^(
$1
', # monospace
+ ];
+ 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;
}