widget/reply: paragraph breaks on input lines unless trailing spaces

[minimedit.git] / upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index afaa047303b3cf420872460325303056d791adf9..7810ff6e613da2e065264ae954c291a08b72f383 100644 (file)
--- 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,12 +44,16 @@ function userupload($input, $target = NULL, $filename = NULL)
 function messagehtml($input)
 {
        # convert user textarea post to formatted html
+       global $User;
        if (empty($input)) {
                return;
        }
+       if ($User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
+               return $input;  # allow html input as is if privileged
+       }
        $html = preg_replace(
-               ["/\r?\n/", "'(?:<br />\n?){2}'"],
-               ["<br />\n", "</p>\n\n<p>"],
+               ["/\r\n?/", "/  +\n/", "/\n/"],
+               ["\n",      "<br />",  "</p>\n<p>"],
                htmlspecialchars($input)
        );
        return "<p>$html</p>";