Skip to content
Permalink
Browse files

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
  • Loading branch information...
plegall committed Mar 10, 2012
1 parent b1c58f5 commit e0f6d5d6a7330c814fddac0d0bc8887a6a505472
Showing with 10 additions and 3 deletions.
  1. +2 −2 admin/site_update.php
  2. +5 −1 i.php
  3. +3 −0 include/config_default.inc.php
@@ -208,7 +208,7 @@
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 @@
continue;
}
$filename = basename($path);
if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $filename))
if (!preg_match($conf['sync_chars_regex'], $filename))
{
array_push(
$errors,
6 i.php
@@ -194,8 +194,12 @@ function parse_request()
}
$req = ltrim($req, '/');
!preg_match('#[^a-zA-Z0-9/_.-]#', $req) or ierror('Invalid chars in request', 400);
foreach (preg_split('#/+#', $req) as $token)
{
preg_match($conf['sync_chars_regex'], $token) or ierror('Invalid chars in request', 400);
}
$page['derivative_path'] = PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$req;
$pos = strrpos($req, '.');
@@ -746,6 +746,9 @@
// enable the synchronization method for adding photos
$conf['enable_synchronization'] = true;
// permitted characters for files/directoris during synchronization
$conf['sync_chars_regex'] = '/^[a-zA-Z0-9-_.]+$/';
// PEM url
$conf['alternative_pem_url'] = '';

0 comments on commit e0f6d5d

Please sign in to comment.
You can’t perform that action at this time.