diff --git a/ecrire/inc/documents.php b/ecrire/inc/documents.php index 5236a15f293d209b2d6b38054fb1985cf4f52402..7a33df6502ea8f229673e5692b6afc77d6321e49 100644 --- a/ecrire/inc/documents.php +++ b/ecrire/inc/documents.php @@ -149,6 +149,19 @@ function copier_document($ext, $orig, $source, $subdir = null) { // pour les images transformees par rotation (action/documenter) $dest = preg_replace(',-r(90|180|270)$,', '', $dest); + while (preg_match(",\.(\w+)$,", $dest, $m)) { + if (!function_exists('verifier_upload_autorise') + or !$r = verifier_upload_autorise($dest) + or $r['autozip']) { + $dest = substr($dest, 0, -strlen($m[0])) . '_' . $m[1]; + break; + } + else { + $dest = substr($dest, 0, -strlen($m[0])); + $ext = $m[1] . "." . $ext; + } + } + // Si le document "source" est deja au bon endroit, ne rien faire if ($source == ($dir . $dest . '.' . $ext)) { return $source;