X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/ebf3182ac0275887fc0609be098329dc30865ee2..2d7b510a9d33a552b024e1db00212658f21afce6:/upload.inc.php diff --git a/upload.inc.php b/upload.inc.php index 4eff8a0..77fa846 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"); } @@ -41,10 +50,139 @@ function userupload($input, $target = NULL, $filename = NULL) function messagehtml($input) { # convert user textarea post to formatted html + global $User; if (empty($input)) { return; } - $html = htmlspecialchars($input); - $html = preg_replace('"(?:
){2}"', "

\n\n

", nl2br($html)); - return "

$html

"; + if ($User and $User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) { + return $input; # allow html input as is if privileged + } + $markup = [ + '{<((?:\w+:|/).+?)>}' => '<$1>', # unescape link entities + '{<(?:https?://)?([^>\s|]+)>}' => '<$1 $1>', # unnamed link + '{<([^>\s|]+)[\s|]([^>]+)>}' => '$2', # hyperlink + "/\r\n?/" => "\n", # unix newlines + "/ +\n/" => "
", # trailing spaces for hard line break + "/^[-*] (.*)$\n?/m" => '
  • $1
  • ', # list item + "/^(.+)$\n?/m" => "

    $1

    \n", # paragraph + "{^

    (

  • .*
  • )(?:

    \n)?}m" => "\n", # list container + '/_(? '$1', # italic + '/\*(? '$1', # bold + '/~(? '$1', # stricken + '/`(? '$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 (isset($input['announce'])) { + $reply['announced'] = !!$input['announce']; + } + 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('

    Bijgevoegd bestand: %s

    ', + $result, basename($result) + ); + } + } + } + + 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; }