X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/159ee0f3d812c9681a00c37f6a2bcaf8a1de83bc..51287a6c12a8df8fc850ce438be668b027fd2c00:/upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index ed9ee77..6175fe2 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -41,10 +41,17 @@ function userupload($input, $target = NULL, $filename = NULL)
 function messagehtml($input)
 {
 	# convert user textarea post to formatted html
+	global $User;
 	if (empty($input)) {
 		return;
 	}
-	$html = htmlspecialchars($input);
-	$html = nl2br($html);
+	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>";
 }