X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/43e650373b89d2fb7ce1d580dccc10ed46dd7fa7..dceaed615cc4046d0f4145d17580fa1b7471c538:/upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index c578a2d..e70f573 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");
 	}
@@ -37,3 +40,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/", "'(?:<br />\n?){2}'"],
+		["<br />\n", "</p>\n\n<p>"],
+		htmlspecialchars($input)
+	);
+	return "<p>$html</p>";
+}