file: update glob function to clean correctely in relative mode

git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3736 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
2017-05-30 08:43:26 +00:00
parent e4e5e5931b
commit 683d5b0a51
2 changed files with 34 additions and 1 deletions
--- a/file.php
+++ b/file.php
@@ -257,7 +257,10 @@ class file
      throw new \Exception ("Glob : can't read some files", 500);
    foreach ($files as &$file)
    {
-      $file = substr ($file, strlen ($this->baseDir)+$relative);
+      if ($relative == 1)
+        $file = substr ($file, strlen ($this->baseDir)+strlen ($this->cwd)+1);
+      else
+        $file = substr ($file, strlen ($this->baseDir));
    }
    return $files;
  }