aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2014-01-23 19:29:42 +0000
committermistic100 <mistic@piwigo.org>2014-01-23 19:29:42 +0000
commit63f3531059a859a834676914d4d5f16fb418c9a1 (patch)
tree5593741b0c6cf86510f75a139b8f65968df13e5d
parente255abf3e22962b71341310a145b071d15fd65e3 (diff)
feature 3031: add $conf['sync_exclude_folders'] parameter
git-svn-id: http://piwigo.org/svn/trunk@26928 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions.php20
-rw-r--r--include/config_default.inc.php3
2 files changed, 16 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)
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index e96f6331d..cd7c0156a 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -759,6 +759,9 @@ $conf['enable_synchronization'] = true;
// permitted characters for files/directoris during synchronization
$conf['sync_chars_regex'] = '/^[a-zA-Z0-9-_.]+$/';
+// folders name exluded during synchronization
+$conf['sync_exclude_folders'] = array();
+
// PEM url (default is http://piwigo.org/ext)
$conf['alternative_pem_url'] = '';