aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-03-10 21:34:48 +0000
committerplegall <plg@piwigo.org>2012-03-10 21:34:48 +0000
commite0f6d5d6a7330c814fddac0d0bc8887a6a505472 (patch)
tree056e52222fc524bed0217f8f568748d8558d03e4 /admin
parentb1c58f59cacb65c819b4234d19a9568f0a66029b (diff)
feature 414 (yes, a 6 years old request): ability to define the list of
permitted characters in file/directory names for synchronization. git-svn-id: http://piwigo.org/svn/trunk@13527 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/site_update.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/site_update.php b/admin/site_update.php
index 2861dc81f..40faec33e 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -208,7 +208,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
foreach (array_diff($fs_fulldirs, array_keys($db_fulldirs)) as $fulldir)
{
$dir = basename($fulldir);
- if (preg_match('/^[a-zA-Z0-9-_.]+$/', $dir))
+ if (preg_match($conf['sync_chars_regex'], $dir))
{
$insert = array(
'id' => $next_id++,
@@ -374,7 +374,7 @@ SELECT id, path
continue;
}
$filename = basename($path);
- if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $filename))
+ if (!preg_match($conf['sync_chars_regex'], $filename))
{
array_push(
$errors,