Changeset 26928 for trunk

Timestamp:

Jan 23, 2014, 8:29:42 PM (10 years ago)

Author:

mistic100

Message:

feature 3031: add $confsync_exclude_folders parameter

Location:

trunk

Files:

• admin/include/functions.php (modified) (2 diffs)
• include/config_default.inc.php (modified) (1 diff)

trunk/admin/include/functions.php

@@ -535 +535 @@
 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))
   {
@@ -544 +556 @@
       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;

trunk/include/config_default.inc.php

@@ -760 +760 @@
 $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'] = '';