issue: wrap items to allow containment

[minimedit.git] / upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index f1018c2417770f09701d67970e1617ae5a4c3ca6..4eff8a09cdcc07374e8ac7e6228bf6c797d0c174 100644 (file)
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -4,6 +4,10 @@ function userupload($input, $target = NULL, $filename = NULL)
        switch ($input['error']) {
        case UPLOAD_ERR_OK:
                break;
+       case UPLOAD_ERR_INI_SIZE:
+       case UPLOAD_ERR_FORM_SIZE:
+               throw new Exception('bestand te groot');
+               break;
        case UPLOAD_ERR_NO_FILE:
                return; # current
        default:
@@ -24,7 +28,7 @@ function userupload($input, $target = NULL, $filename = NULL)
        }
 
        if (!@move_uploaded_file($input['tmp_name'], $target)) {
-               throw new Exception('bestand kon niet worden opgeslagen');
+               throw new Exception("bestand kon niet worden opgeslagen in $target");
        }
 
        foreach (@glob('thumb/*/') as $thumbres) {
@@ -33,3 +37,14 @@ function userupload($input, $target = NULL, $filename = NULL)
        }
        return $target;
 }
+
+function messagehtml($input)
+{
+       # convert user textarea post to formatted html
+       if (empty($input)) {
+               return;
+       }
+       $html = htmlspecialchars($input);
+       $html = preg_replace('"(?:<br />){2}"', "</p>\n\n<p>", nl2br($html));
+       return "<p>$html</p>";
+}