X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/04a1a7a24edbf8423a48f51609d545a5a7a3eb42..dc93b0f8e382f9f449051a1b0412ed5fafebf77b:/upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index d7d572d..e270b76 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -48,16 +48,22 @@ function messagehtml($input)
 	if (empty($input)) {
 		return;
 	}
-	if ($User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
+	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/"    => "</p>\n<p>", # newlines start paragraphs
-		'/\b_(\w+)_\b/'   => '<em>$1</em>',         # italic
-		'/\b\*(\w+)\*\b/' => '<strong>$1</strong>', # bold
+		"/^[-*] (.*)$\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
 	];
-	$html = preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input));
-	return "<p>$html</p>";
+	return preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input));
 }