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

diff --git a/upload.inc.php b/upload.inc.php
index d7d572d..0ee432b 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -52,11 +52,14 @@ function messagehtml($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
+		'/_(?<!\w_)(.+?)_(?!\w)/'      => '<em>$1</em>',         # italic
+		'/\*(?<!\w\*)(.+?)\*(?!\w)/'   => '<strong>$1</strong>', # bold
 	];
 	$html = preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input));
 	return "<p>$html</p>";