X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/f8527c143033f51fecd929789ef7ad6589c8c2b4..0ec5d194ee1838759b2a79c574ebfdca30bc7404:/upload.inc.php
diff --git a/upload.inc.php b/upload.inc.php
index 86af604..e270b76 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -48,7 +48,7 @@ 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 = [
@@ -57,10 +57,13 @@ function messagehtml($input)
'{<([^>\s|]+)[\s|]([^>]+)>}' => '$2', # hyperlink
"/\r\n?/" => "\n", # unix newlines
"/ +\n/" => "
", # trailing spaces for hard line break
- "/\n/" => "
", # newlines start paragraphs - '/\b_(\w+)_\b/' => '$1', # italic - '/\b\*(\w+)\*\b/' => '$1', # bold + "/^[-*] (.*)$\n?/m" => '
$1
\n", # paragraph + "{^(
$1
', # monospace
];
- $html = preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input));
- return "$html
"; + return preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input)); }