Skip to content

Commit 0040ca4

Browse files
author
Till Brehm
committed
Merge branch '6459-fix-dkim-selector-regex' into 'develop'
Fixed regex pattern for dkim_selector #6459 Closes #6459 See merge request ispconfig/ispconfig3!1769
2 parents cb58605 + 93628b0 commit 0040ca4

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@
131131
'default' => 'default',
132132
'value' => 'default',
133133
'width' => '20',
134-
'maxlength' => '63',
134+
'maxlength' => '126',
135135
'validators' => array ( 0 => array ( 'type' => 'REGEX',
136-
'regex' => '/^(?=.*[a-z])[a-z0-9]{1,63}$/',
136+
'regex' => '/^[a-z0-9]{1,63}(?:\.[a-z0-9]{1,63})?$/',
137137
'errmsg'=> 'dkim_selector_error'),
138138
),
139139
),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $wb['limit_maildomain_txt'] = 'Die maximale Anzahl an E-Mail Domains für Ihr Ko
1717
$wb['policy_txt'] = 'Spamfilter';
1818
$wb['no_policy'] = '- nicht aktiviert -';
1919
$wb['dkim_selector_txt'] = 'DKIM-Selector';
20-
$wb['dkim_selector_error'] = 'Ungültiger DKIM-Selector. Verwenden Sie nur max. 63 alphanumerische Zeichen (a-z oder 0-9)';
20+
$wb['dkim_selector_error'] = 'Ungültiger DKIM-Selector. Verwenden Sie nur max. 63 alphanumerische Zeichen (a-z oder 0-9), gefolgt von einem optionalen Punkt und weiter 63 alphanumerischen Zeichen.';
2121
$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
2222
$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
2323
$wb['relayhost_txt'] = 'Relayhost';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $wb['policy_txt'] = 'Spamfilter';
1919
$wb['no_policy'] = '- not enabled -';
2020
$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
2121
$wb['dkim_selector_txt'] = 'DKIM-Selector';
22-
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
22+
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars, optional followed by a period and by another string of no more than 63 lower-case alphanumeric characters.';
2323
$wb['relayhost_txt'] = 'Relayhost';
2424
$wb['relayhost_user_txt'] = 'Relayhost User';
2525
$wb['relayhost_password_txt'] = 'Relayhost Password';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $wb['dkim_generate_txt'] = 'Generar clave privada DKIM';
66
$wb['dkim_private_key_error'] = 'Clave privada DKIM no válida';
77
$wb['dkim_private_txt'] = 'Clave privada DKIM';
88
$wb['dkim_public_txt'] = 'Clave pública DKIM\nsólo para información';
9-
$wb['dkim_selector_error'] = 'Selector DKIM no válido. Use como máximo 63 caracteres alfanuméricos en minúsculas (a-z o 0-9)';
9+
$wb['dkim_selector_error'] = 'Selector DKIM inválido. Utilice <subdominio(.subdominio)>. El subdominio tiene un máximo de 63 caracteres en minúsculas <a-z y 0-9> y el segundo subdominio es opcional';
1010
$wb['dkim_selector_txt'] = 'Selector DKIM';
1111
$wb['dkim_settings_txt'] = 'Correo Identificado por Claves de Dominio (DKIM)';
1212
$wb['dkim_txt'] = 'Activar DKIM';

0 commit comments

Comments
 (0)