X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/862d91755026431efbf621e3da7107f26ba221ed..a7131e1013d54f0a6f0e80d05d04ff724d68466e:/upload.inc.php
diff --git a/upload.inc.php b/upload.inc.php
index f1018c2..6175fe2 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:
@@ -24,7 +28,7 @@ function userupload($input, $target = NULL, $filename = NULL)
}
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 +37,21 @@ 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
+ }
+ $html = preg_replace(
+ ["/\r?\n/", "'(?:
\n?){2}'"],
+ ["
\n", "
"], + htmlspecialchars($input) + ); + return "
$html
"; +}