widget/reply: formatting syntax for _italics_

[minimedit.git] / upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index f79600f892de3ee018377e1ab9adf460b3ce3646..10881a24a0f9317216339e0b88dc65232afc0207 100644 (file)
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -1,6 +1,4 @@
 <?php
-$Page->api = $_SERVER['HTTP_ACCEPT'] == 'text/plain';
-
 function userupload($input, $target = NULL, $filename = NULL)
 {
        switch ($input['error']) {
@@ -29,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");
        }
@@ -51,8 +52,8 @@ function messagehtml($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/",      '/\b_(\w+)_\b/'],
+               ["\n",      "<br />",  "</p>\n<p>", '<em>$1</em>'  ],
                htmlspecialchars($input)
        );
        return "<p>$html</p>";