X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/ebf3182ac0275887fc0609be098329dc30865ee2..v4.4-16-gb168fd753d:/upload.inc.php
diff --git a/upload.inc.php b/upload.inc.php
index 4eff8a0..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 = preg_replace('"(?:
){2}"', "
", 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/", "'(?:
\n?){2}'"],
+ ["
\n", "
"], + htmlspecialchars($input) + ); return "
$html
"; }