X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/e64861a7760cfe34596e193a6a3ed2ef39b25892..85bd24522825b832a8f30c5629b81cf90307a388:/upload.inc.php
diff --git a/upload.inc.php b/upload.inc.php
index f79600f..10881a2 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -1,6 +1,4 @@
api = $_SERVER['HTTP_ACCEPT'] == 'text/plain';
-
function userupload($input, $target = NULL, $filename = NULL)
{
switch ($input['error']) {
@@ -29,6 +27,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");
}
@@ -51,8 +52,8 @@ function messagehtml($input)
return $input; # allow html input as is if privileged
}
$html = preg_replace(
- ["/\r?\n/", "'(?:
\n?){2}'"],
- ["
\n", "
"],
+ ["/\r\n?/", "/ +\n/", "/\n/", '/\b_(\w+)_\b/'],
+ ["\n", "
", "
", '$1' ], htmlspecialchars($input) ); return "
$html
";