X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/ab3ebc53acde6f060649a01403a886f5485f7bf6..af5d5f4037aabc493afa60a5394ab3f8f6134917:/upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index aa24558..6175fe2 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -1,16 +1,34 @@
 <?php
-function userupload($input, $target)
+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:
-		throw new Exception("Afbeelding niet goed ontvangen.");
+		throw new Exception('bestand niet goed ontvangen: '.$input['error']);
+	}
+
+	if (isset($target)) {
+		if (!file_exists($target) and !@mkdir($target, 0777, TRUE)) {
+			throw new Exception("bestand kon niet geplaatst worden in $target");
+		}
+		$target .= '/';
 	}
+	if (isset($filename)) {
+		$target .= $filename;
+	}
+	else {
+		$target .= $input['name'];
+	}
+
 	if (!@move_uploaded_file($input['tmp_name'], $target)) {
-		throw new Exception("Fout bij opslaan.");
+		throw new Exception("bestand kon niet worden opgeslagen in $target");
 	}
 
 	foreach (@glob('thumb/*/') as $thumbres) {
@@ -19,3 +37,21 @@ function userupload($input, $target)
 	}
 	return $target;
 }
+
+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>"],
+		htmlspecialchars($input)
+	);
+	return "<p>$html</p>";
+}