X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/671946af5f06753cb83c9e1fdaf0bdd44ea28b8d..85bd24522825b832a8f30c5629b81cf90307a388:/upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index 74219ed..10881a2 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -27,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");
 	}
@@ -45,12 +48,12 @@ function messagehtml($input)
 	if (empty($input)) {
 		return;
 	}
-	if ($User and $User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
+	if ($User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
 		return $input;  # allow html input as is if privileged
 	}
 	$html = preg_replace(
-		["/\r?\n/", "'(?:<br />\n?){2}'"],
-		["<br />\n", "</p>\n\n<p>"],
+		["/\r\n?/", "/  +\n/", "/\n/",      '/\b_(\w+)_\b/'],
+		["\n",      "<br />",  "</p>\n<p>", '<em>$1</em>'  ],
 		htmlspecialchars($input)
 	);
 	return "<p>$html</p>";