Commit e50c6f9e authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'Fix6362' into 'develop'

Added validator for listname Fix #6362

Closes #6362

See merge request ispconfig/ispconfig3!1617
parents 33409b39 9df37ff0
Pipeline #12575 passed with stage
in 9 seconds
......@@ -103,6 +103,10 @@ $form["tabs"]['mailinglist'] = array (
'errmsg'=> 'listname_error_empty'),
1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'listname_error_unique'),
2 => array (
'type' => 'REGEX',
'regex' => '/^[_a-z0-9][\w\.\-_\+@]{1,255}$/',
'errmsg'=> 'listname_error_regex'),
),
'filters' => array(
0 => array( 'event' => 'SAVE',
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Limit reached';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['listname_error_empty'] = 'Listname is empty.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Invalid domain name.';
$wb['email_in_use_txt'] = 'Email is in use';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Достигнат лимит';
$wb['domain_error_empty'] = 'Полето с домейн е празно.';
$wb['listname_error_empty'] = 'Listname is empty.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Invalid domain name.';
$wb['email_in_use_txt'] = 'Имейла се изполва';
$wb['no_domain_perm'] = 'Ти нямаш права за този домейн.';
......
......@@ -3,6 +3,7 @@ $wb['mailinglist_txt'] = 'Lista de email';
$wb['limit_mailmailinglist_txt'] = 'O limite foi alcançado.';
$wb['domain_error_empty'] = 'O domínio está vazio.';
$wb['listname_error_empty'] = 'O nome da lista está vazio.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'O domínio é inválido.';
$wb['email_in_use_txt'] = 'O email já está em uso.';
$wb['no_domain_perm'] = 'Você não tem permissão para este domínio.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Limite atteinte';
$wb['domain_error_empty'] = 'Le domain est vide.';
$wb['listname_error_empty'] = 'Le nom de la liste est vide.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Nom de domaine invalide.';
$wb['email_in_use_txt'] = 'L\'email est en cours d\'utilisation';
$wb['no_domain_perm'] = 'Vous n\'avez pas la permission pour ce domain.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Omezení limitu dosaženo';
$wb['domain_error_empty'] = 'Doména je prázdná.';
$wb['listname_error_empty'] = 'Název seznamu je prázdný.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Neplatný název domény.';
$wb['email_in_use_txt'] = 'E-mail je již používán';
$wb['no_domain_perm'] = 'Nemáte oprávnění pro tuto doménu.';
......
......@@ -3,6 +3,7 @@ $wb['limit_mailmailinglist_txt'] = 'Limit erreicht';
$wb['domain_error_empty'] = 'Domain ist leer.';
$wb['listname_error_empty'] = 'Listenname ist leer.';
$wb['domain_error_regex'] = 'Domain Name ist nicht gültig.';
$wb['listname_error_regex'] = 'Der Listenname ist ungültig. Die Mindestlänge beträgt 2 Zeichen (erlaubt sind: [a-z 1-9 - _])';
$wb['email_in_use_txt'] = 'E-Mail Adresse ist bereits in Benutzung';
$wb['no_domain_perm'] = 'Sie haben keine Rechte für diese Domain.';
$wb['password_strength_txt'] = 'Passwortkomplexität';
......
......@@ -3,6 +3,7 @@ $wb['mailinglist_txt'] = 'Mailing list';
$wb['limit_mailmailinglist_txt'] = 'Begrænsninger nået';
$wb['domain_error_empty'] = 'Domæne er tom.';
$wb['listname_error_empty'] = 'Listenavn er tom.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Ugyldigt domæne name.';
$wb['email_in_use_txt'] = 'E-mail er i brug';
$wb['no_domain_perm'] = 'Du har ikke tilladelse til dette domæne.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Το όριο ξεπεράστηκε.';
$wb['domain_error_empty'] = 'Το Domain είναι άδειο.';
$wb['listname_error_empty'] = 'Η λίστα είναι άδεια.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Το όνομα domain δεν είναι έγκυρο/';
$wb['email_in_use_txt'] = 'Το email χρησιμοποιείται ήδη.';
$wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα σε αυτό το domain.';
......
......@@ -3,6 +3,7 @@ $wb['mailinglist_txt'] = 'Mailing list';
$wb['limit_mailmailinglist_txt'] = 'Limit reached';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['listname_error_empty'] = 'Listname is empty.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Invalid domain name.';
$wb['email_in_use_txt'] = 'Email is in use';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
......@@ -19,4 +20,4 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
$wb['email_error_isemail'] = 'Email address is invalid.';
?>
\ No newline at end of file
?>
......@@ -9,6 +9,7 @@ $wb['email_txt'] = 'Correo';
$wb['generate_password_txt'] = 'Generar contraseña';
$wb['limit_mailmailinglist_txt'] = 'Límite alcanzado';
$wb['listname_error_empty'] = 'Nombre de la lista vacío.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['listname_error_unique'] = 'Ya existe en el servidor un lista de correos con ese nombre. Por favor elija otro.';
$wb['listname_txt'] = 'Nombre de lista';
$wb['mailinglist_txt'] = 'Lista de correo';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Limit reached';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['listname_error_empty'] = 'Listname is empty.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Invalid domain name.';
$wb['email_in_use_txt'] = 'Email is in use';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Limite atteinte';
$wb['domain_error_empty'] = 'Le domain est vide.';
$wb['listname_error_empty'] = 'Le nom de la liste est vide.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Nom de domaine invalide.';
$wb['email_in_use_txt'] = 'L’email est en cours d’utilisation';
$wb['no_domain_perm'] = 'Vous n’avez pas la permission pour ce domain.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Iskorišten je maksimalan broj email lista.';
$wb['domain_error_empty'] = 'Domena je prazna.';
$wb['listname_error_empty'] = 'Naziv liste je prazan.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Neispravan naziv domene.';
$wb['email_in_use_txt'] = 'Email je u upotrebi';
$wb['no_domain_perm'] = 'Nemate dozvole za ovu domenu.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Limit reached';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['listname_error_empty'] = 'Listname is empty.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Invalid domain name.';
$wb['email_in_use_txt'] = 'Email is in use';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Limit reached';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['listname_error_empty'] = 'Listname is empty.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Invalid domain name.';
$wb['email_in_use_txt'] = 'Email is in use';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Limite raggiunto';
$wb['domain_error_empty'] = 'Dominio vuoto.';
$wb['listname_error_empty'] = 'Listname vuoto.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Nome dominio non valido.';
$wb['email_in_use_txt'] = 'Email è già in uso';
$wb['no_domain_perm'] = 'Non hai i diritti per questo dominio.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Limit reached';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['listname_error_empty'] = 'Listname is empty.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Invalid domain name.';
$wb['email_in_use_txt'] = 'Email is in use';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Limit reached';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['listname_error_empty'] = 'Listname is empty.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Invalid domain name.';
$wb['email_in_use_txt'] = 'Email is in use';
$wb['no_domain_perm'] = 'You have no permission for this domain.';
......
......@@ -2,6 +2,7 @@
$wb['limit_mailmailinglist_txt'] = 'Limit przekroczony';
$wb['domain_error_empty'] = 'Domena jest pusta.';
$wb['listname_error_empty'] = 'Nazwa listy jest pusta.';
$wb['listname_error_regex'] = 'The list name is invalid. The minimum length is 2 characters (allowed are: [a-z 1-9 - _]).';
$wb['domain_error_regex'] = 'Nieprawidłowa nazwa domeny.';
$wb['email_in_use_txt'] = 'Email jest już w użyciu';
$wb['no_domain_perm'] = 'Nie masz uprawnień dla tej domeny.';
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment