diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/include/functions.php | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index 1df6e4f45..2060e03b4 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -534,22 +534,28 @@ DELETE */ function get_fs_directories($path, $recursive = true) { + global $conf; + $dirs = array(); $path = rtrim($path, '/'); + $exclude_folders = array_merge( + $conf['sync_exclude_folders'], + array( + '.', '..', '.svn', + 'thumbnail', 'pwg_high', + 'pwg_representative', + ) + ); + $exclude_folders = array_flip($exclude_folders); + if (is_dir($path)) { if ($contents = opendir($path)) { while (($node = readdir($contents)) !== false) { - if ($node != '.' - and $node != '..' - and $node != '.svn' - and $node != 'thumbnail' - and $node != 'pwg_high' - and $node != 'pwg_representative' - and is_dir($path.'/'.$node)) + if (is_dir($path.'/'.$node) and !isset($exclude_folders[$node])) { $dirs[] = $path.'/'.$node; if ($recursive) |