Skip to content

Commit e50c6f9

Browse files
author
Till Brehm
committed
Merge branch 'Fix6362' into 'develop'
Added validator for listname Fix #6362 Closes #6362 See merge request ispconfig/ispconfig3!1617
2 parents 33409b3 + 9df37ff commit e50c6f9

26 files changed

+30
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@
103103
'errmsg'=> 'listname_error_empty'),
104104
1 => array ( 'type' => 'UNIQUE',
105105
'errmsg'=> 'listname_error_unique'),
106+
2 => array (
107+
'type' => 'REGEX',
108+
'regex' => '/^[_a-z0-9][\w\.\-_\+@]{1,255}$/',
109+
'errmsg'=> 'listname_error_regex'),
106110
),
107111
'filters' => array(
108112
0 => array( 'event' => 'SAVE',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
$wb['limit_mailmailinglist_txt'] = 'Limit reached';
33
$wb['domain_error_empty'] = 'Domain is empty.';
44
$wb['listname_error_empty'] = 'Listname is empty.';
5+
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
56
$wb['domain_error_regex'] = 'Invalid domain name.';
67
$wb['email_in_use_txt'] = 'Email is in use';
78
$wb['no_domain_perm'] = 'You have no permission for this domain.';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
$wb['limit_mailmailinglist_txt'] = 'Достигнат лимит';
33
$wb['domain_error_empty'] = 'Полето с домейн е празно.';
44
$wb['listname_error_empty'] = 'Listname is empty.';
5+
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
56
$wb['domain_error_regex'] = 'Invalid domain name.';
67
$wb['email_in_use_txt'] = 'Имейла се изполва';
78
$wb['no_domain_perm'] = 'Ти нямаш права за този домейн.';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $wb['mailinglist_txt'] = 'Lista de email';
33
$wb['limit_mailmailinglist_txt'] = 'O limite foi alcançado.';
44
$wb['domain_error_empty'] = 'O domínio está vazio.';
55
$wb['listname_error_empty'] = 'O nome da lista está vazio.';
6+
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
67
$wb['domain_error_regex'] = 'O domínio é inválido.';
78
$wb['email_in_use_txt'] = 'O email já está em uso.';
89
$wb['no_domain_perm'] = 'Você não tem permissão para este domínio.';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
$wb['limit_mailmailinglist_txt'] = 'Limite atteinte';
33
$wb['domain_error_empty'] = 'Le domain est vide.';
44
$wb['listname_error_empty'] = 'Le nom de la liste est vide.';
5+
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
56
$wb['domain_error_regex'] = 'Nom de domaine invalide.';
67
$wb['email_in_use_txt'] = 'L\'email est en cours d\'utilisation';
78
$wb['no_domain_perm'] = 'Vous n\'avez pas la permission pour ce domain.';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
$wb['limit_mailmailinglist_txt'] = 'Omezení limitu dosaženo';
33
$wb['domain_error_empty'] = 'Doména je prázdná.';
44
$wb['listname_error_empty'] = 'Název seznamu je prázdný.';
5+
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
56
$wb['domain_error_regex'] = 'Neplatný název domény.';
67
$wb['email_in_use_txt'] = 'E-mail je již používán';
78
$wb['no_domain_perm'] = 'Nemáte oprávnění pro tuto doménu.';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $wb['limit_mailmailinglist_txt'] = 'Limit erreicht';
33
$wb['domain_error_empty'] = 'Domain ist leer.';
44
$wb['listname_error_empty'] = 'Listenname ist leer.';
55
$wb['domain_error_regex'] = 'Domain Name ist nicht gültig.';
6+
$wb['listname_error_regex'] = 'Der Listenname ist ungültig. Die Mindestlänge beträgt 2 Zeichen (erlaubt sind: [a-z 1-9 - _])';
67
$wb['email_in_use_txt'] = 'E-Mail Adresse ist bereits in Benutzung';
78
$wb['no_domain_perm'] = 'Sie haben keine Rechte für diese Domain.';
89
$wb['password_strength_txt'] = 'Passwortkomplexität';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $wb['mailinglist_txt'] = 'Mailing list';
33
$wb['limit_mailmailinglist_txt'] = 'Begrænsninger nået';
44
$wb['domain_error_empty'] = 'Domæne er tom.';
55
$wb['listname_error_empty'] = 'Listenavn er tom.';
6+
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
67
$wb['domain_error_regex'] = 'Ugyldigt domæne name.';
78
$wb['email_in_use_txt'] = 'E-mail er i brug';
89
$wb['no_domain_perm'] = 'Du har ikke tilladelse til dette domæne.';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
$wb['limit_mailmailinglist_txt'] = 'Το όριο ξεπεράστηκε.';
33
$wb['domain_error_empty'] = 'Το Domain είναι άδειο.';
44
$wb['listname_error_empty'] = 'Η λίστα είναι άδεια.';
5+
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
56
$wb['domain_error_regex'] = 'Το όνομα domain δεν είναι έγκυρο/';
67
$wb['email_in_use_txt'] = 'Το email χρησιμοποιείται ήδη.';
78
$wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα σε αυτό το domain.';

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $wb['mailinglist_txt'] = 'Mailing list';
33
$wb['limit_mailmailinglist_txt'] = 'Limit reached';
44
$wb['domain_error_empty'] = 'Domain is empty.';
55
$wb['listname_error_empty'] = 'Listname is empty.';
6+
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
67
$wb['domain_error_regex'] = 'Invalid domain name.';
78
$wb['email_in_use_txt'] = 'Email is in use';
89
$wb['no_domain_perm'] = 'You have no permission for this domain.';
@@ -19,4 +20,4 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.';
1920
$wb['password_match_txt'] = 'The passwords do match.';
2021
$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
2122
$wb['email_error_isemail'] = 'Email address is invalid.';
22-
?>
23+
?>

0 commit comments

Comments
 (0)