issue/activity: prevent abbreviation of subsequent images

[minimedit.git] / upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index 74219ed0043c01e77a3db61026e5c09dc0fe1036..e70f5738a3bfacafa1a4013b42f5905010c7d676 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");
        }
@@ -45,7 +48,7 @@ function messagehtml($input)
        if (empty($input)) {
                return;
        }
-       if ($User and $User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
+       if ($User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
                return $input;  # allow html input as is if privileged
        }
        $html = preg_replace(