X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/ebf3182ac0275887fc0609be098329dc30865ee2..83209975037c6fadba1fd0555e37e95c17fe6099:/upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index 4eff8a0..e270b76 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");
 	}
@@ -41,10 +44,26 @@ 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('"(?:<br />){2}"', "</p>\n\n<p>", nl2br($html));
-	return "<p>$html</p>";
+	if ($User and $User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
+		return $input;  # allow html input as is if privileged
+	}
+	$markup = [
+		'{&lt;((?:\w+:|/).+?)&gt;}'    => '<$1>',                # unescape link entities
+		'{<(?:https?://)?([^>\s|]+)>}' => '<$1 $1>',             # unnamed link
+		'{<([^>\s|]+)[\s|]([^>]+)>}'   => '<a href="$1">$2</a>', # hyperlink
+		"/\r\n?/" => "\n",        # unix newlines
+		"/  +\n/" => "<br />",    # trailing spaces for hard line break
+		"/^[-*] (.*)$\n?/m"            => '<li>$1</li>',         # list item
+		"/^(.+)$\n?/m"                 => "<p>$1</p>\n",         # paragraph
+		"{^<p>(<li>.*</li>)(?:</p>\n)?}m" => "<ul>$1</ul>\n",    # list container
+		'/_(?<!\w_)(.+?)_(?!\w)/'      => '<em>$1</em>',         # italic
+		'/\*(?<!\w\*)(.+?)\*(?!\w)/'   => '<strong>$1</strong>', # bold
+		'/~(?<!\w~)(.+?)~(?!\w)/'      => '<s>$1</s>',           # stricken
+		'/`(?<!\w`)(.+?)`(?!\w)/'      => '<code>$1</code>',     # monospace
+	];
+	return preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input));
 }