lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Work on automatic ecm.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-04-17 18:52:14 +00:00
parent 22271d7a40
commit b670cdaea9
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/lib/files.lib.php
View File

@ -64,10 +64,13 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
if ($qualified) if ($qualified)
{ {
$isdir=is_dir(dol_osencode($path."/".$file));
// Check whether this is a file or directory and whether we're interested in that type // Check whether this is a file or directory and whether we're interested in that type
if (is_dir(dol_osencode($path."/".$file)) && (($types=="directories") || ($types=="all"))) if ($isdir && (($types=="directories") || ($types=="all") || $recursive))
{ {
// Add entry into file_list array // Add entry into file_list array
if (($types=="directories") || ($types=="all"))
{
if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file); if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file); if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
@ -81,14 +84,15 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
"type" => 'dir' "type" => 'dir'
); );
} }
}
// if we're in a directory and we want recursive behavior, call this function again // if we're in a directory and we want recursive behavior, call this function again
if ($recursive) if ($recursive)
{ {
$file_list = array_merge($file_list,dol_dir_list($path."/".$file."/", $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder)); $file_list = array_merge($file_list,dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode));
} }
} }
else if (! is_dir(dol_osencode($path."/".$file)) && (($types == "files") || ($types == "all"))) else if (! $isdir && (($types == "files") || ($types == "all")))
{ {
// Add file into file_list array // Add file into file_list array
if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file); if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);