Skip to content

Commit 14fe6d4

Browse files
committed
- Allow wildcards in backup excludes.
1 parent 4926298 commit 14fe6d4

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

interface/web/sites/form/web_domain.tform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@
523523
'backup_excludes' => array (
524524
'datatype' => 'VARCHAR',
525525
'validators' => array ( 0 => array ( 'type' => 'REGEX',
526-
'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,]*$@',
526+
'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,*]*$@',
527527
'errmsg'=> 'backup_excludes_error_regex'),
528528
),
529529
'formtype' => 'TEXT',

interface/web/sites/form/web_vhost_subdomain.tform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@
513513
'backup_excludes' => array (
514514
'datatype' => 'VARCHAR',
515515
'validators' => array ( 0 => array ( 'type' => 'REGEX',
516-
'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,]*$@',
516+
'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,*]*$@',
517517
'errmsg'=> 'backup_excludes_error_regex'),
518518
),
519519
'formtype' => 'TEXT',

interface/web/sites/lib/lang/de_web_domain.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,6 @@ $wb['variables_txt'] = 'Variablen';
124124
$wb['added_by_txt'] = 'Hinzugefügt von';
125125
$wb['added_date_txt'] = 'Hinzugefügt am';
126126
$wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse';
127-
$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen)';
127+
$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen. Beispiel: web/cache/*,web/backup)';
128128
$wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.';
129129
?>

interface/web/sites/lib/lang/de_web_vhost_subdomain.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,6 @@ $wb['allowed_rewrite_rule_directives_txt'] = 'Erlaubte Direktiven:';
121121
$wb['configuration_error_txt'] = 'KONFIGURATIONSFEHLER';
122122
$wb['variables_txt'] = 'Variablen';
123123
$wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse';
124-
$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen)';
124+
$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen. Beispiel: web/cache/*,web/backup)';
125125
$wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.';
126126
?>

interface/web/sites/lib/lang/en_web_domain.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,6 @@ $wb['variables_txt'] = 'Variables';
124124
$wb['added_by_txt'] = 'Added by';
125125
$wb['added_date_txt'] = 'Added date';
126126
$wb['backup_excludes_txt'] = 'Excluded Directories';
127-
$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas)';
127+
$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
128128
$wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
129129
?>

interface/web/sites/lib/lang/en_web_vhost_subdomain.lng

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
121121
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
122122
$wb['configuration_error_txt'] = "CONFIGURATION ERROR";
123123
$wb['variables_txt'] = 'Variables';
124-
$wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse';
125-
$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen)';
126-
$wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.';
124+
$wb['backup_excludes_txt'] = 'Excluded Directories';
125+
$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
126+
$wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
127127
?>

0 commit comments

Comments
 (0)