Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Function dol_dir_list broken on PHP5

Browse Source
This commit is contained in:
Laurent Destailleur
2009-10-12 18:31:45 +00:00
parent e3d43cf781
commit 4a11a0e335
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,22 +37,24 @@
*/ */
function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter="", $sortcriteria="name", $sortorder=SORT_ASC, $mode=0) function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter="", $sortcriteria="name", $sortorder=SORT_ASC, $mode=0)
{ {
dol_syslog("files.lib.php::dol_dir_list $path"); dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".$excludefilter);
$loaddate=$mode?true:false; $loaddate=$mode?true:false;
$loadsize=$mode?true:false; $loadsize=$mode?true:false;
// Clean parameters // Clean parameters
$path=eregi_replace('[\\/]+$','',utf8_check($path)?utf8_decode($path):$path); $path=eregi_replace('[\\/]+$','',$path);
$newpath=(utf8_check($path)?utf8_decode($path):$path);
if (! is_dir($path)) return array(); if (! is_dir($newpath)) return array();
if ($dir = opendir($path)) if ($dir = opendir($newpath))
{ {
$file_list = array(); $file_list = array();
while (false !== ($file = readdir($dir))) while (false !== ($file = readdir($dir)))
{ {
// readdir return value in ISO and we want UTF8 in memory // readdir return value in ISO and we want UTF8 in memory
$newfile=$file;
if (! utf8_check($file)) $file=utf8_encode($file); if (! utf8_check($file)) $file=utf8_encode($file);
$qualified=1; $qualified=1;
@@ -64,11 +66,11 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
if ($qualified) if ($qualified)
{ {
// 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($path."/".$file) && (($types=="directories") || ($types=="all"))) if (is_dir($newpath."/".$newfile) && (($types=="directories") || ($types=="all")))
{ {
// Add entry into file_list array // Add entry into file_list array
if ($loaddate || $sortcriteria == 'date') $filedate=filemtime(utf8_check($path."/".$file)?utf8_decode($path."/".$file):$path."/".$file); if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
if ($loadsize || $sortcriteria == 'size') $filesize=filesize(utf8_check($path."/".$file)?utf8_decode($path."/".$file):$path."/".$file); if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
if (! $filter || eregi($filter,$path.'/'.$file)) if (! $filter || eregi($filter,$path.'/'.$file))
{ {
@@ -84,14 +86,14 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
// 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));
} }
} }
else if (! is_dir($path."/".$file) && (($types == "files") || ($types == "all"))) else if (! is_dir($newpath."/".$newfile) && (($types == "files") || ($types == "all")))
{ {
// Add file into file_list array // Add file into file_list array
if ($loaddate || $sortcriteria == 'date') $filedate=filemtime(utf8_check($path."/".$file)?utf8_decode($path."/".$file):$path."/".$file); if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
if ($loadsize || $sortcriteria == 'size') $filesize=filesize(utf8_check($path."/".$file)?utf8_decode($path."/".$file):$path."/".$file); if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
if (! $filter || eregi($filter,$path.'/'.$file)) if (! $filter || eregi($filter,$path.'/'.$file))
{ {
$file_list[] = array( $file_list[] = array(
@@ -120,7 +122,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
} }
else else
{ {
return false; return array();
} }
} }

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

@@ -2190,22 +2190,26 @@ function dol_delete_dir_recursive($dir,$count=0)
{ {
while (false !== ($item = readdir($handle))) while (false !== ($item = readdir($handle)))
{ {
// readdir return value in ISO and we want UTF8 in memory
$newitem=$item;
if (! utf8_check($item)) $item=utf8_encode($item);
if ($item != "." && $item != "..") if ($item != "." && $item != "..")
{ {
if (is_dir("$dir/$item")) if (is_dir("$newdir/$newitem"))
{ {
$count=dol_delete_dir_recursive("$dir/$item",$count); $count=dol_delete_dir_recursive("$dir/$item",$count);
} }
else else
{ {
unlink("$dir/$item"); unlink("$newdir/$newitem");
$count++; $count++;
//echo " removing $dir/$item<br>\n"; //echo " removing $dir/$item<br>\n";
} }
} }
} }
closedir($handle); closedir($handle);
rmdir($dir); rmdir($newdir);
$count++; $count++;
//echo "removing $dir<br>\n"; //echo "removing $dir<br>\n";
} }