Skip to content

Commit 5de1ce8

Browse files
author
Florian Schaal
committed
auto create / update dns-records for dkim-handling
1 parent 21b26d7 commit 5de1ce8

24 files changed

+102
-55
lines changed

‎interface/web/js/mail_domain_dkim.js‎

100644100755
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,13 @@ This Javascript is invoked by
4646
alert("Error creating XMLHTTP-instance");
4747
return false;
4848
} else {
49+
var domain=encodeURIComponent(document.getElementById("domain").value)
50+
var selector=encodeURIComponent(document.getElementById("dkim_selector").value)
51+
var publickey=encodeURIComponent(document.getElementById("dkim_public").value)
52+
var privatekey=encodeURIComponent(document.getElementById("dkim_private").value)
4953
request.open('POST', 'mail/mail_domain_dkim_create.php', true);
5054
request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
51-
request.send('domain='+value+'&action='+action+'&pkey='+privatekey);
55+
request.send('domain='+domain+'&action='+action+'&dkim_selector='+selector+'&dkim_public='+publickey+'&dkim_private='+privatekey);
5256
request.onreadystatechange = interpretRequest;
5357
}
5458
}
@@ -58,15 +62,15 @@ This Javascript is invoked by
5862
case 4:
5963
if (request.status != 200) {alert("Request done but NOK\nError:"+request.status);}
6064
else {
65+
document.getElementsByName('dkim_selector')[0].value = request.responseXML.getElementsByTagName('selector')[0].firstChild.nodeValue;
6166
document.getElementsByName('dkim_private')[0].value = request.responseXML.getElementsByTagName('privatekey')[0].firstChild.nodeValue;
62-
document.getElementsByName('dkim_public')[0].value = request.responseXML.getElementsByTagName('publickey')[0].firstChild.nodeValue;
63-
document.getElementsByName('dns_record')[0].value = request.responseXML.getElementsByTagName('dns_record')[0].firstChild.nodeValue;
67+
document.getElementsByName('dkim_public')[0].value = request.responseXML.getElementsByTagName('publickey')[0].firstChild.nodeValue;
68+
document.getElementsByName('dns_record')[0].value = request.responseXML.getElementsByTagName('dns_record')[0].firstChild.nodeValue;
6469
}
6570
break;
6671
default:
6772
break;
6873
}
6974
}
70-
7175
var serverType = jQuery('#dkim_private').val();
7276
setRequest('show','{tmpl_var name="domain"}',serverType);

‎interface/web/mail/lib/lang/ar_mail_domain.lng‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ $wb["dkim_txt"] = 'enable DKIM';
1414
$wb["dkim_private_txt"] = 'DKIM Private-key';
1515
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
1616
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
17-
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
17+
$wb["dkim_dns_txt"] = 'DNS-Record';
1818
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
1919
$wb['dkim_selector_txt'] = 'DKIM-Selector';
20-
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
20+
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
2121
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
2222
?>

‎interface/web/mail/lib/lang/bg_mail_domain.lng‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
m_selector_error'] = '<?php
22
$wb['server_id_txt'] = 'Server';
33
$wb['domain_txt'] = 'Domain';
44
$wb['type_txt'] = 'Type';
@@ -12,9 +12,9 @@ $wb["dkim_txt"] = 'enable DKIM';
1212
$wb["dkim_private_txt"] = 'DKIM Private-key';
1313
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
1414
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
15-
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
15+
$wb["dkim_dns_txt"] = 'DNS-Record';
1616
$wb['dkim_selector_txt'] = 'DKIM-Selector';
17-
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
17+
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
1818
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
1919
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
2020
$wb['policy_txt'] = 'Спамфилтър';

‎interface/web/mail/lib/lang/br_mail_domain.lng‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ $wb["dkim_txt"] = 'enable DKIM';
1414
$wb["dkim_private_txt"] = 'DKIM Private-key';
1515
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
1616
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
17-
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
17+
$wb["dkim_dns_txt"] = 'DNS-Record';
1818
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
1919
$wb['dkim_selector_txt'] = 'DKIM-Selector';
20-
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
20+
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
2121
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
2222
?>

‎interface/web/mail/lib/lang/cz_mail_domain.lng‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ $wb["dkim_txt"] = 'enable DKIM';
1212
$wb["dkim_private_txt"] = 'DKIM Private-key';
1313
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
1414
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
15-
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
15+
$wb["dkim_dns_txt"] = 'DNS-Record';
1616
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
1717
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
1818
$wb['dkim_selector_txt'] = 'DKIM-Selector';
19-
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
19+
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
2020
$wb['policy_txt'] = 'Spamový filtr';
2121
$wb['no_policy'] = '- nepovoleno -';
2222
?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $wb["dkim_txt"] = 'DKIM aktivieren';
77
$wb["dkim_private_txt"] = 'DKIM Private-key';
88
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
99
$wb["dkim_generate_txt"] = 'erstelle DKIM Private-key';
10-
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
10+
$wb["dkim_dns_txt"] = 'DNS-Record';
1111
$wb["dkim_private_key_error"] = 'ungueltiger DKIM-Private key';
1212
$wb['domain_error_empty'] = 'Domain ist leer';
1313
$wb['domain_error_unique'] = 'Doppelte Domain.';
@@ -17,6 +17,6 @@ $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 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)';
2121
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
2222
?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $wb["dkim_txt"] = 'enable DKIM';
77
$wb["dkim_private_txt"] = 'DKIM Private-key';
88
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
99
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
10-
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
10+
$wb["dkim_dns_txt"] = 'DNS-Record';
1111
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
1212
$wb["domain_error_empty"] = 'Domain is empty.';
1313
$wb["domain_error_unique"] = 'Duplicate Domain.';
@@ -19,5 +19,5 @@ $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)';
22+
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
2323
?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ $wb["dkim_txt"] = 'Activar DKIM';
1414
$wb["dkim_private_txt"] = 'Clave privada DKIM';
1515
$wb["dkim_public_txt"] = 'Clave pública DKIM\nsólo para información';
1616
$wb["dkim_generate_txt"] = 'Generar clave privada DKIM';
17-
$wb["dkim_dns_txt"] = 'Registro DNS (TYPE TXT)<br><br>añade este registro a tus DNS';
17+
$wb["dkim_dns_txt"] = 'Registro DNS';
1818
$wb["dkim_private_key_error"] = 'Clave privada DKIM no válida';
1919
$wb['dkim_selector_txt'] = 'Selector DKIM';
20-
$wb['dkim_selector_error'] = 'Selector DKIM no válido. Usar sólo caracteres alfanuméricos en minúsculas (a-z o 0-9)';
20+
$wb['dkim_selector_error'] = 'Selector DKIM no válido. Usar sólo caracteres alfanuméricos en minúsculas (a-z o 0-9) up to 63 chars';
2121
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
2222
?>

‎interface/web/mail/lib/lang/fi_mail_domain.lng‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ $wb["dkim_txt"] = 'enable DKIM';
1414
$wb["dkim_private_txt"] = 'DKIM Private-key';
1515
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
1616
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
17-
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
17+
$wb["dkim_dns_txt"] = 'DNS-Record';
1818
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
1919
$wb['dkim_selector_txt'] = 'DKIM-Selector';
20-
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
20+
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
2121
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
2222
?>

‎interface/web/mail/lib/lang/fr_mail_domain.lng‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $wb['dkim_txt'] = 'Activer DKIM';
77
$wb['dkim_private_txt'] = 'ClérivéDKIM';
88
$wb['dkim_public_txt'] = 'Cléublique DKIM\npour information seulement';
99
$wb['dkim_generate_txt'] = 'Gérer la clérivéDKIM';
10-
$wb['dkim_dns_txt'] = 'Enregistrement DNS (TYPE TXT)<br><br>Ajouter l\'enregistrement àotre DNS';
10+
$wb['dkim_dns_txt'] = 'Enregistrement DNS';
1111
$wb['dkim_private_key_error'] = 'ClérivéDKIM invalide';
1212
$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
1313
$wb['domain_error_empty'] = 'Le domaine est vide.';
@@ -19,6 +19,6 @@ $wb['policy_txt'] = 'Filtre antispam';
1919
$wb['no_policy'] = '- inactif -';
2020
$wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autoriséour ce compte.';
2121
$wb['dkim_selector_txt'] = 'DKIM-Selector';
22-
$wb['dkim_selector_error'] = 'Selecteur DKIM non valide. Utiliser que des caractès alphanuméques minuscules (a-z et/oo 0-9)';
22+
$wb['dkim_selector_error'] = 'Selecteur DKIM non valide. Utiliser que des caractès alphanuméques minuscules (a-z et/oo 0-9) up to 63 chars';
2323
?>
2424

0 commit comments

Comments
 (0)