From b9534e205a481b061679aa3c19011cee6047d8b6 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Sun, 1 Jan 2006 17:06:17 +0000
Subject: [PATCH] preparation UPLOAD_DIRECT
---
ecrire/inc_getdocument.php3 | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/ecrire/inc_getdocument.php3 b/ecrire/inc_getdocument.php3
index 022ed0f713..65f43c5967 100644
--- a/ecrire/inc_getdocument.php3
+++ b/ecrire/inc_getdocument.php3
@@ -52,23 +52,21 @@ function effacer_repertoire_temporaire($nom) {
function copier_document($ext, $orig, $source) {
$dir = creer_repertoire_documents($ext);
- $dest = $dir .
- ereg_replace("[^.a-zA-Z0-9_=-]+", "_",
+ $dest = ereg_replace("[^.a-zA-Z0-9_=-]+", "_",
translitteration(ereg_replace("\.([^.]+)$", "",
ereg_replace("<[^>]*>", '', basename($orig)))));
// Si le document "source" est deja au bon endroit, ne rien faire
- if ($source == ($dest . '.' . $ext))
+ if ($source == ($dir . $dest . '.' . $ext))
return $source;
// sinon tourner jusqu'a trouver un numero correct
$n = 0;
- while (@file_exists($newFile = $dest.($n++ ? '-'.$n : '').'.'.$ext));
+ while (@file_exists($dir.($newFile = $dest.($n++ ? '-'.$n : '').'.'.$ext)));
$newFile = preg_replace('/[.]+/', '.', $newFile);
-
- if ($r = deplacer_fichier_upload($source, $newFile))
- return $newFile;
+ if ($r = deplacer_fichier_upload($source, $dir.$newFile))
+ return $dir.$newFile;
}
//
@@ -77,6 +75,7 @@ function copier_document($ext, $orig, $source) {
function deplacer_fichier_upload($source, $dest) {
// Securite
+ ## !! interdit pour le moment d'uploader depuis l'espace prive (UPLOAD_DIRECT)
if (strstr($dest, "..")) {
spip_log("stop deplacer_fichier_upload: '$dest'");
exit;
--
GitLab