From 5284b876e503b34255232570f6d3f9056baad40c Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Wed, 17 May 2006 10:40:48 +0000
Subject: [PATCH] corrige le bug de repertoire qui se produisait (pour rien,
bien souvent) lors de l indexation d un document distant
---
ecrire/inc/flock.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ecrire/inc/flock.php b/ecrire/inc/flock.php
index 6563f99d4c..662db2ce2d 100644
--- a/ecrire/inc/flock.php
+++ b/ecrire/inc/flock.php
@@ -140,8 +140,10 @@ function supprimer_fichier($fichier) {
// $base/${subdir}_ sinon ; le flag $nobase signale qu'on ne veut pas de $base/
//
function sous_repertoire($base, $subdir, $nobase = false) {
- $base = str_replace("//", "/", "$base/");
+ if (!preg_match(',[/_]$,', $base)) $base .= '/';
+ $base = str_replace("//", "/", $base);
$baseaff = $nobase ? '' : $base;
+ # $base = 'IMG/distant/' ou 'IMG/distant_'
if (!strlen($subdir)) return $baseaff;
@@ -150,7 +152,8 @@ function sous_repertoire($base, $subdir, $nobase = false) {
if (@file_exists("$base${subdir}.plat"))
return "$baseaff${subdir}_";;
- $path = $base.'/'.$subdir;
+ $path = $base.$subdir; # $path = 'IMG/distant/pdf' ou 'IMG/distant_pdf'
+
if (@file_exists("$path/.ok"))
return "$baseaff$subdir/";
--
GitLab