makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure consistent output from filelist

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4354 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-08-09 11:18:05 +00:00
parent d85c1e052d
commit f41a46c92f
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/includes/functions_admin.php
View file

@ -161,20 +161,31 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
{ {
$matches = array(); $matches = array();
$dh = opendir($rootdir . $dir); // Remove initial / if present
$rootdir = (substr($rootdir, 0, 1) == '/') ? substr($rootdir, 1) : $rootdir;
// Add closing / if present
$rootdir = ($rootdir && substr($rootdir, -1) != '/') ? $rootdir . '/' : $rootdir;
// Remove initial / if present
$dir = (substr($dir, 0, 1) == '/') ? substr($dir, 1) : $dir;
// Add closing / if present
$dir = ($dir && substr($dir, -1) != '/') ? $dir . '/' : $dir;
$dh = opendir($rootdir . $dir);
while ($fname = readdir($dh)) while ($fname = readdir($dh))
{ {
if (is_file("$rootdir$dir/$fname") && filesize("$rootdir$dir/$fname") && preg_match('#\.' . $type . '$#i', $fname)) if (is_file("$rootdir$dir$fname"))
{
if (filesize("$rootdir$dir$fname") && preg_match('#\.' . $type . '$#i', $fname))
{ {
$matches[$dir][] = $fname; $matches[$dir][] = $fname;
} }
else if ($fname{0} != '.' && is_dir("$rootdir$dir/$fname")) }
else if ($fname{0} != '.' && is_dir("$rootdir$dir$fname"))
{ {
$matches += filelist($rootdir, "$dir/$fname", $type); $matches += filelist($rootdir, "$dir$fname", $type);
} }
} }
closedir($dh); closedir($dh);
return $matches; return $matches;