X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/cc9044a1aa3f79cda743040573d49bc71fb7805f..a257ef8b6e9d435938803471bd655be9d9734370:/upload.inc.php
diff --git a/upload.inc.php b/upload.inc.php
index 0ee432b..ff4ecd3 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,10 +63,87 @@ function messagehtml($input)
'{<([^>\s|]+)[\s|]([^>]+)>}' => '$2', # hyperlink
"/\r\n?/" => "\n", # unix newlines
"/ +\n/" => "
", # trailing spaces for hard line break
- "/\n/" => "
", # newlines start paragraphs + "/^[-*] (.*)$\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 (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'] .= "/$result"; + if (preg_match('(^image/)', $_FILES['image']['type'])) { + $reply['message'] .= sprintf('