X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/862d91755026431efbf621e3da7107f26ba221ed..52aab71e2268171618efe0f8f8e683b9bc5406f6:/upload.inc.php?ds=inline
diff --git a/upload.inc.php b/upload.inc.php
index f1018c2..4f5c5fe 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -4,6 +4,10 @@ function userupload($input, $target = NULL, $filename = NULL)
switch ($input['error']) {
case UPLOAD_ERR_OK:
break;
+ case UPLOAD_ERR_INI_SIZE:
+ case UPLOAD_ERR_FORM_SIZE:
+ throw new Exception('bestand te groot');
+ break;
case UPLOAD_ERR_NO_FILE:
return; # current
default:
@@ -23,8 +27,11 @@ 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');
+ throw new Exception("bestand kon niet worden opgeslagen in $target");
}
foreach (@glob('thumb/*/') as $thumbres) {
@@ -33,3 +40,29 @@ function userupload($input, $target = NULL, $filename = NULL)
}
return $target;
}
+
+function messagehtml($input)
+{
+ # convert user textarea post to formatted html
+ global $User;
+ if (empty($input)) {
+ return;
+ }
+ if ($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/" => "
", # newlines start paragraphs
+ '/_(? '$1', # italic
+ '/\*(? '$1', # bold
+ '/~(? '$1', # stricken
+ '/`(? '$1
', # monospace
+ ];
+ $html = preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input));
+ return "
$html
"; +}