diff --git a/ecrire/exec/admin_tech.php b/ecrire/exec/admin_tech.php index 7cb06e3b4a6dd05d347b42a12858064d545be5dd..9358833f1b6f5f398581ceec8318d833d3a9057e 100644 --- a/ecrire/exec/admin_tech.php +++ b/ecrire/exec/admin_tech.php @@ -46,7 +46,15 @@ function exec_admin_tech_dist() $dir_dump = $repertoire; } else { debut_gauche(); - $dir_dump = _DIR_TRANSFERT . $connect_login . '/'; + $repertoire = _DIR_TRANSFERT; + if(!@file_exists($repertoire)) { + $repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire); + $repertoire = sous_repertoire(_DIR_TMP, $repertoire); + } + if(!@file_exists($repertoire.$connect_login)) { + $sous_rep = sous_repertoire($repertoire, $connect_login); + } + $dir_dump = $sous_rep . '/'; } include_spip('exec/export_all'); $file = joli_repertoire($dir_dump . export_nom_fichier_dump($dir_dump,false)); diff --git a/ecrire/exec/export_all.php b/ecrire/exec/export_all.php index b4304a0165ac8810560855096e6efed7a21eb3fd..8a50e89f2c72640c72dda8489fc4bd4713b19020 100644 --- a/ecrire/exec/export_all.php +++ b/ecrire/exec/export_all.php @@ -80,7 +80,15 @@ function exec_export_all_dist() } $dir = $repertoire; } else { - $dir = _DIR_TRANSFERT . $connect_login . '/'; + $repertoire = _DIR_TRANSFERT; + if(!@file_exists($repertoire)) { + $repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire); + $repertoire = sous_repertoire(_DIR_TMP, $repertoire); + } + if(!@file_exists($repertoire.$connect_login)) { + $sous_rep = sous_repertoire($repertoire, $connect_login); + } + $dir = $sous_rep . '/'; } if (!$archive) diff --git a/ecrire/exec/import_all.php b/ecrire/exec/import_all.php index 05e443b05e00b68801d4ae1dcefcd681376a5d16..868df437067720a4b5f5df3703074db3746715e1 100644 --- a/ecrire/exec/import_all.php +++ b/ecrire/exec/import_all.php @@ -50,7 +50,15 @@ function verifier_version_sauvegarde ($archive) { } $dir = $repertoire; } else { - $dir = _DIR_TRANSFERT . $connect_login . '/'; + $repertoire = _DIR_TRANSFERT; + if(!@file_exists($repertoire)) { + $repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire); + $repertoire = sous_repertoire(_DIR_TMP, $repertoire); + } + if(!@file_exists($repertoire.$connect_login)) { + $sous_rep = sous_repertoire($repertoire, $connect_login); + } + $dir = $sous_rep . '/'; } $_fopen = ($flag_gz) ? gzopen : fopen; $_fread = ($flag_gz) ? gzread : fread; @@ -139,7 +147,15 @@ function import_all_continue() } $dir = $repertoire; } else { - $dir = _DIR_TRANSFERT . $connect_login . '/'; + $repertoire = _DIR_TRANSFERT; + if(!@file_exists($repertoire)) { + $repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire); + $repertoire = sous_repertoire(_DIR_TMP, $repertoire); + } + if(!@file_exists($repertoire.$connect_login)) { + $sous_rep = sous_repertoire($repertoire, $connect_login); + } + $dir = $sous_rep . '/'; } $archive = $dir . $request['archive']; $affiche_progression_pourcent = @filesize($archive); diff --git a/ecrire/inc/actions.php b/ecrire/inc/actions.php index 8092cd5420bdb7c013b0b88209a6f03ac9af7acf..a81a0e052a07d94637735c44fc53f3b359e1e36c 100644 --- a/ecrire/inc/actions.php +++ b/ecrire/inc/actions.php @@ -251,7 +251,15 @@ function determine_upload() $var_auth = $var_auth(); } if ($connect_statut != '0minirezo') return false; - return _DIR_TRANSFERT . + $repertoire = _DIR_TRANSFERT; + if(!@file_exists($repertoire)) { + $repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire); + $repertoire = sous_repertoire(_DIR_TMP, $repertoire); + } + if(!$connect_toutes_rubriques AND !@file_exists($repertoire.$connect_login)) { + $sous_rep = sous_repertoire($repertoire, $connect_login); + } + return $repertoire . ($connect_toutes_rubriques ? '' : ($connect_login . '/')); } diff --git a/tmp/upload/remove.txt b/tmp/upload/remove.txt deleted file mode 100644 index 977321426cfc18189220e566cc5748cc233e21f0..0000000000000000000000000000000000000000 --- a/tmp/upload/remove.txt +++ /dev/null @@ -1,3 +0,0 @@ -Vous pouvez effacer ce fichier sans dommages. - -You can safely remove this file.