From 14fe6d43f307c01684008ddd2d3270409b169326 Mon Sep 17 00:00:00 2001 From: Falko Timme <ft@falkotimme.com> Date: Thu, 21 Nov 2013 05:03:54 -0500 Subject: [PATCH] - Allow wildcards in backup excludes. --- interface/web/sites/form/web_vhost_subdomain.tform.php | 2 +- interface/web/sites/lib/lang/de_web_domain.lng | 2 +- interface/web/sites/lib/lang/en_web_vhost_subdomain.lng | 6 +++--- interface/web/sites/lib/lang/en_web_domain.lng | 2 +- interface/web/sites/lib/lang/de_web_vhost_subdomain.lng | 2 +- interface/web/sites/form/web_domain.tform.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index ed590c9..59f38b5 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -523,7 +523,7 @@ 'backup_excludes' => array ( 'datatype' => 'VARCHAR', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,]*$@', + 'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,*]*$@', 'errmsg'=> 'backup_excludes_error_regex'), ), 'formtype' => 'TEXT', diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php index 328fc27..1448a64 100644 --- a/interface/web/sites/form/web_vhost_subdomain.tform.php +++ b/interface/web/sites/form/web_vhost_subdomain.tform.php @@ -513,7 +513,7 @@ 'backup_excludes' => array ( 'datatype' => 'VARCHAR', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,]*$@', + 'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,*]*$@', 'errmsg'=> 'backup_excludes_error_regex'), ), 'formtype' => 'TEXT', diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng index 4a6dc0c..986b64e 100644 --- a/interface/web/sites/lib/lang/de_web_domain.lng +++ b/interface/web/sites/lib/lang/de_web_domain.lng @@ -124,6 +124,6 @@ $wb['added_by_txt'] = 'Hinzugefügt von'; $wb['added_date_txt'] = 'Hinzugefügt am'; $wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse'; -$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen)'; +$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen. Beispiel: web/cache/*,web/backup)'; $wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.'; ?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng index f454aa4..5b75973 100644 --- a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng @@ -121,6 +121,6 @@ $wb['configuration_error_txt'] = 'KONFIGURATIONSFEHLER'; $wb['variables_txt'] = 'Variablen'; $wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse'; -$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen)'; +$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen. Beispiel: web/cache/*,web/backup)'; $wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.'; ?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index 415bebd..330b820 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -124,6 +124,6 @@ $wb['added_by_txt'] = 'Added by'; $wb['added_date_txt'] = 'Added date'; $wb['backup_excludes_txt'] = 'Excluded Directories'; -$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas)'; +$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)'; $wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.'; ?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng index 96e16f4..3c9009e 100644 --- a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng @@ -121,7 +121,7 @@ $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; $wb['configuration_error_txt'] = "CONFIGURATION ERROR"; $wb['variables_txt'] = 'Variables'; -$wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse'; -$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen)'; -$wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.'; +$wb['backup_excludes_txt'] = 'Excluded Directories'; +$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)'; +$wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.'; ?> \ No newline at end of file -- Gitblit v1.9.1