Merge branch '5849-emailfilters-target-should-allow-more-characters-at-least-a-slash' into 'develop'

Resolve "Emailfilters target should allow more characters - at least a slash"

Closes #5849

See merge request ispconfig/ispconfig3!1293

Author: Marius Burkard

interface/web/mail/form/mail_user_filter.tform.php

@@ -121,7 +121,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[\p{Latin}0-9\.\-\_\ \&]{0,100}$/u',
+					'regex' => '/^[\p{Latin}0-9\.\-\_\ \&\/]{0,100}$/u',
 					'errmsg'=> 'target_error_regex'),
 			),
 			'default' => '',

interface/web/mail/lib/lang/ar_mail_user_filter.lng

@@ -6,7 +6,7 @@ $wb['active_txt'] = 'Active';
 $wb['rulename_error_empty'] = 'Name is empty.';
 $wb['searchterm_is_empty'] = 'Search term is empty.';
 $wb['source_txt'] = 'Source';
-$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, &, /, and {space}';
 $wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
 $wb['subject_txt'] = 'Subject';
 $wb['from_txt'] = 'From';

interface/web/mail/lib/lang/bg_mail_user_filter.lng

@@ -6,7 +6,7 @@ $wb['active_txt'] = 'Активен';
 $wb['rulename_error_empty'] = 'Name is empty.';
 $wb['searchterm_is_empty'] = 'Search term is empty.';
 $wb['source_txt'] = 'Source';
-$wb['target_error_regex'] = 'Позволените символи са: a-z, 0-9, -, ., _, и {интервал}';
+$wb['target_error_regex'] = 'Позволените символи са: a-z, 0-9, -, ., _, &, /, и {интервал}';
 $wb['limit_mailfilter_txt'] = 'Максималният брой на емайл филтрите е достигнат.';
 $wb['subject_txt'] = 'Тема';
 $wb['from_txt'] = 'От';

interface/web/mail/lib/lang/ca_mail_user_filter.lng

@@ -6,7 +6,7 @@ $wb['active_txt'] = 'Actif';
 $wb['rulename_error_empty'] = 'Le nom est vide.';
 $wb['searchterm_is_empty'] = 'Le terme recherché est vide.';
 $wb['source_txt'] = 'Source';
-$wb['target_error_regex'] = 'La cible ne peut contenir que ces caractères : a-z, 0-9, -, ., _, et {espace}';
+$wb['target_error_regex'] = 'La cible ne peut contenir que ces caractères : a-z, 0-9, -, ., _, &, /, et {espace}';
 $wb['limit_mailfilter_txt'] = 'Le nombre max de filtres courriel est atteint.';
 $wb['subject_txt'] = 'Sujet';
 $wb['from_txt'] = 'De';

interface/web/mail/lib/lang/cz_mail_user_filter.lng

@@ -6,7 +6,7 @@ $wb['active_txt'] = 'Aktivní';
 $wb['rulename_error_empty'] = 'Název je prázdný.';
 $wb['searchterm_is_empty'] = 'Vyhledávací řádek je prázdný.';
 $wb['source_txt'] = 'Zdroj';
-$wb['target_error_regex'] = 'Cíl může obsahovat jen tyto znaky: a-z, 0-9, -, ., _, a {mezeru}';
+$wb['target_error_regex'] = 'Cíl může obsahovat jen tyto znaky: a-z, 0-9, -, ., _, &, /, a {mezeru}';
 $wb['limit_mailfilter_txt'] = 'Byl dosažen max. počet e-mailový filtrovacích pravidel.';
 $wb['subject_txt'] = 'Předmět';
 $wb['from_txt'] = 'Odesílatel';

interface/web/mail/lib/lang/de_mail_user_filter.lng

@@ -6,7 +6,7 @@ $wb['active_txt'] = 'Aktiv';
 $wb['rulename_error_empty'] = 'Name ist leer.';
 $wb['searchterm_is_empty'] = 'Suchbegriff ist leer.';
 $wb['source_txt'] = 'Quelle';
-$wb['target_error_regex'] = 'Das Ziel beinhaltet wahrscheinlich diese Zeichen: a-z, 0-9, -, ., _, und {raum}';
+$wb['target_error_regex'] = 'Das Ziel beinhaltet wahrscheinlich diese Zeichen: a-z, 0-9, -, ., _, &, /, und {space}';
 $wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.';
 $wb['subject_txt'] = 'Betreff';
 $wb['from_txt'] = 'Von';

interface/web/mail/lib/lang/dk_mail_user_filter.lng

@@ -6,7 +6,7 @@ $wb['active_txt'] = 'Aktiv';
 $wb['rulename_error_empty'] = 'Navn er tomt.';
 $wb['searchterm_is_empty'] = 'Søgetermer er tomme.';
 $wb['source_txt'] = 'Kilde';
-$wb['target_error_regex'] = 'Målet må kun indeholde disse tegn: a-z, 0-9, -, ., _, og {space}';
+$wb['target_error_regex'] = 'Målet må kun indeholde disse tegn: a-z, 0-9, -, ., _, &, /, og {space}';
 $wb['limit_mailfilter_txt'] = 'Max. antal af mailfiltere er nået.';
 $wb['subject_txt'] = 'Emne';
 $wb['from_txt'] = 'Fra';

interface/web/mail/lib/lang/el_mail_user_filter.lng

@@ -6,7 +6,7 @@ $wb['active_txt'] = 'Ενεργό';
 $wb['rulename_error_empty'] = 'Το όνομα δεν έχει οριστεί.';
 $wb['searchterm_is_empty'] = 'Ο όρος αναζήτησης δεν έχει οριστεί.';
 $wb['source_txt'] = 'Πηγή';
-$wb['target_error_regex'] = 'Ο προορισμός μπορεί να περιέχει μόνο αυτούς τους χαρακτήρες: a-z, 0-9, -, ., _, και {κενό}';
+$wb['target_error_regex'] = 'Ο προορισμός μπορεί να περιέχει μόνο αυτούς τους χαρακτήρες: a-z, 0-9, -, ., _, &, /, και {κενό}';
 $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων mail.';
 $wb['subject_txt'] = 'Θέμα';
 $wb['from_txt'] = 'Από';

interface/web/mail/lib/lang/en_mail_user_filter.lng

@@ -6,7 +6,7 @@ $wb['active_txt'] = 'Active';
 $wb['rulename_error_empty'] = 'Name is empty.';
 $wb['searchterm_is_empty'] = 'Search term is empty.';
 $wb['source_txt'] = 'Source';
-$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, &, /, and {space}';
 $wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
 $wb['subject_txt'] = 'Subject';
 $wb['from_txt'] = 'From';

interface/web/mail/lib/lang/es_mail_user_filter.lng

@@ -23,7 +23,7 @@ $wb['size_under_txt'] = 'Tamaño del correo inferior a (KB)';
 $wb['source_txt'] = 'Origen';
 $wb['stop_txt'] = 'Detener';
 $wb['subject_txt'] = 'Asunto';
-$wb['target_error_regex'] = 'El destino solo puede contener los siguientes caracteres: a-z, 0-9, -, ., _, y {espacio}';
+$wb['target_error_regex'] = 'El destino solo puede contener los siguientes caracteres: a-z, 0-9, -, ., _, &, /, y {espacio}';
 $wb['target_txt'] = 'Carpeta';
 $wb['to_txt'] = 'Para';
 $wb['list_id_txt'] = 'List ID';