git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
foto: api directory modification headers
[minimedit.git]
/
upload.inc.php
diff --git
a/upload.inc.php
b/upload.inc.php
index afaa047303b3cf420872460325303056d791adf9..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'];
}
$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");
}
if (!@move_uploaded_file($input['tmp_name'], $target)) {
throw new Exception("bestand kon niet worden opgeslagen in $target");
}
@@
-41,9
+44,13
@@
function userupload($input, $target = NULL, $filename = NULL)
function messagehtml($input)
{
# convert user textarea post to formatted html
function messagehtml($input)
{
# convert user textarea post to formatted html
+ global $User;
if (empty($input)) {
return;
}
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>"],
$html = preg_replace(
["/\r?\n/", "'(?:<br />\n?){2}'"],
["<br />\n", "</p>\n\n<p>"],