Skip to content

Commit 604d25e

Browse files
author
Carsten Schoene
committed
FS#3268 - implement IPv6 address field for DNS templates
1 parent 6b1d788 commit 604d25e

27 files changed

+62
-1
lines changed

‎interface/web/dns/dns_wizard.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@
202202

203203
if(isset($_POST['ip']) && $_POST['ip'] == '') $error .= $app->lng('error_ip_empty').'<br />';
204204

205+
if(isset($_POST['ipv6']) && $_POST['ipv6'] == '') $error .= $app->lng('error_ipv6_empty').'<br />';
206+
205207
if(isset($_POST['ns1']) && $_POST['ns1'] == '') $error .= $app->lng('error_ns1_empty').'<br />';
206208
elseif(isset($_POST['ns1']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,30}$/', $_POST['ns1'])) $error .= $app->lng('error_ns1_regex').'<br />';
207209

@@ -238,6 +240,7 @@
238240
$tpl_content = $template_record['template'];
239241
if($_POST['domain'] != '') $tpl_content = str_replace('{DOMAIN}', $_POST['domain'], $tpl_content);
240242
if($_POST['ip'] != '') $tpl_content = str_replace('{IP}', $_POST['ip'], $tpl_content);
243+
if($_POST['ipv6'] != '') $tpl_content = str_replace('{IPV6}',$_POST['ipv6'],$tpl_content);
241244
if($_POST['ns1'] != '') $tpl_content = str_replace('{NS1}', $_POST['ns1'], $tpl_content);
242245
if($_POST['ns2'] != '') $tpl_content = str_replace('{NS2}', $_POST['ns2'], $tpl_content);
243246
if($_POST['email'] != '') $tpl_content = str_replace('{EMAIL}', $_POST['email'], $tpl_content);

‎interface/web/dns/form/dns_template.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
'formtype' => 'CHECKBOXARRAY',
7575
'default' => '',
7676
'separator' => ',',
77-
'value' => array('DOMAIN' => 'Domain', 'IP' => 'IP Address', 'NS1' => 'NS 1', 'NS2' => 'NS 2', 'EMAIL' => 'Email', 'DKIM' => 'DKIM (use TXT|{DOMAIN}.|{DKIM} in your Template)'),
77+
'value' => array('DOMAIN' => 'Domain', 'IP' => 'IP Address', 'IPV6' => 'IPv6 Address', 'NS1' => 'NS 1', 'NS2' => 'NS 2', 'EMAIL' => 'Email', 'DKIM' => 'DKIM (use TXT|{DOMAIN}.|{DKIM} in your Template)'),
7878
'validators' => array ( 0 => array ('type' => 'CUSTOM',
7979
'class' => 'validate_dkim',
8080
'function' => 'check_template',

‎interface/web/dns/lib/lang/ar_dns_wizard.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $wb['email_txt'] = 'Email';
99
$wb['ns1_txt'] = 'NS 1';
1010
$wb['ns2_txt'] = 'NS 2';
1111
$wb['ip_txt'] = 'IP Address';
12+
$wb['ipv6_txt'] = 'IPv6 Address';
1213
$wb['error_origin_empty'] = 'Origin empty.';
1314
$wb['error_ns_empty'] = 'NS empty.';
1415
$wb['error_mbox_empty'] = 'Mbox empty.';
@@ -19,6 +20,7 @@ $wb['error_minimum_empty'] = 'Minimum empty.';
1920
$wb['error_ttl_empty'] = 'TTL empty.';
2021
$wb['error_domain_empty'] = 'Domain empty';
2122
$wb['error_ip_empty'] = 'IP empty.';
23+
$wb['error_ipv6_empty'] = 'IPv6 empty.';
2224
$wb['error_ns1_empty'] = 'NS1 empty.';
2325
$wb['error_ns2_empty'] = 'NS2 empty.';
2426
$wb['error_email_empty'] = 'EMail empty.';

‎interface/web/dns/lib/lang/bg_dns_wizard.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $wb['email_txt'] = 'Емайл';
99
$wb['ns1_txt'] = 'NS 1';
1010
$wb['ns2_txt'] = 'NS 2';
1111
$wb['ip_txt'] = 'IP адрес';
12+
$wb['ipv6_txt'] = 'IPv6 адрес';
1213
$wb['error_origin_empty'] = 'Origin empty.';
1314
$wb['error_ns_empty'] = 'NS empty.';
1415
$wb['error_mbox_empty'] = 'Mbox empty.';
@@ -19,6 +20,7 @@ $wb['error_minimum_empty'] = 'Minimum empty.';
1920
$wb['error_ttl_empty'] = 'TTL empty.';
2021
$wb['error_domain_empty'] = 'Domain empty';
2122
$wb['error_ip_empty'] = 'IP empty.';
23+
$wb['error_ipv6_empty'] = 'IPv6 empty.';
2224
$wb['error_ns1_empty'] = 'NS1 empty.';
2325
$wb['error_ns2_empty'] = 'NS2 empty.';
2426
$wb['error_email_empty'] = 'Полето с имейла е празно';

‎interface/web/dns/lib/lang/br_dns_wizard.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $wb['email_txt'] = 'Correio';
99
$wb['ns1_txt'] = 'NS 1';
1010
$wb['ns2_txt'] = 'NS 2';
1111
$wb['ip_txt'] = 'Endereço IP';
12+
$wb['ipv6_txt'] = 'Endereço IPv6';
1213
$wb['error_origin_empty'] = 'Origem em branco.';
1314
$wb['error_ns_empty'] = 'NS vazio.';
1415
$wb['error_mbox_empty'] = 'Mbox vazia.';
@@ -19,6 +20,7 @@ $wb['error_minimum_empty'] = 'Minimum vazio.';
1920
$wb['error_ttl_empty'] = 'TTL vazio.';
2021
$wb['error_domain_empty'] = 'Domínio vazio';
2122
$wb['error_ip_empty'] = 'IP vazio.';
23+
$wb['error_ipv6_empty'] = 'IPv6 vazio.';
2224
$wb['error_ns1_empty'] = 'NS1 vazio.';
2325
$wb['error_ns2_empty'] = 'NS2 vazio.';
2426
$wb['error_email_empty'] = 'Correio vazio.';

‎interface/web/dns/lib/lang/cz_dns_wizard.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $wb['email_txt'] = 'E-mail';
99
$wb['ns1_txt'] = 'NS 1';
1010
$wb['ns2_txt'] = 'NS 2';
1111
$wb['ip_txt'] = 'IP adresa';
12+
$wb['ipv6_txt'] = 'IPv6 adresa';
1213
$wb['error_origin_empty'] = 'Zdroj je prázdný.';
1314
$wb['error_ns_empty'] = 'NS je prázdný.';
1415
$wb['error_mbox_empty'] = 'Mbox je prázdný.';
@@ -19,6 +20,7 @@ $wb['error_minimum_empty'] = 'Minimum je prázdný.';
1920
$wb['error_ttl_empty'] = 'TTL je prázdný.';
2021
$wb['error_domain_empty'] = 'Doména je prázdná';
2122
$wb['error_ip_empty'] = 'IP adresa je prázdná.';
23+
$wb['error_ipv6_empty'] = 'IPv6 adresa je prázdná.';
2224
$wb['error_ns1_empty'] = 'NS1 je prázdný.';
2325
$wb['error_ns2_empty'] = 'NS2 je prázdný.';
2426
$wb['error_email_empty'] = 'E-mail je prázdný.';

‎interface/web/dns/lib/lang/de_dns_wizard.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ $wb['dkim_txt'] = 'DKIM aktiviert';
1313
$wb['ns1_txt'] = 'NS 1';
1414
$wb['ns2_txt'] = 'NS 2';
1515
$wb['ip_txt'] = 'IP Adresse';
16+
$wb['ipv6_txt'] = 'IPv6 Adresse';
1617
$wb['error_origin_empty'] = 'Quelle ist leer.';
1718
$wb['error_ns_empty'] = 'NS ist leer.';
1819
$wb['error_mbox_empty'] = 'E-Mail Adresse ist leer.';
@@ -23,6 +24,7 @@ $wb['error_minimum_empty'] = 'Minimum leer.';
2324
$wb['error_ttl_empty'] = 'TTL ist leer.';
2425
$wb['error_domain_empty'] = 'Domain ist leer';
2526
$wb['error_ip_empty'] = 'IP Adresse ist leer.';
27+
$wb['error_ipv6_empty'] = 'IPv6 Adresse ist leer.';
2628
$wb['error_ns1_empty'] = 'NS1 ist leer.';
2729
$wb['error_ns2_empty'] = 'NS2 ist leer.';
2830
$wb['error_email_empty'] = 'E-Mail Adresse ist leer.';

‎interface/web/dns/lib/lang/el_dns_wizard.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $wb['email_txt'] = 'Email';
99
$wb['ns1_txt'] = 'NS 1';
1010
$wb['ns2_txt'] = 'NS 2';
1111
$wb['ip_txt'] = 'Διεύθυνση IP';
12+
$wb['ipv6_txt'] = 'Διεύθυνση IPv6';
1213
$wb['error_origin_empty'] = 'Δεν έχει οριστεί το Origin.';
1314
$wb['error_ns_empty'] = 'Δεν έχει οριστεί ο NS.';
1415
$wb['error_mbox_empty'] = 'Δεν έχει οριστεί το Mbox.';
@@ -19,6 +20,7 @@ $wb['error_minimum_empty'] = 'Δεν έχει οριστεί το Minimum.';
1920
$wb['error_ttl_empty'] = 'Δεν έχει οριστεί το TTL.';
2021
$wb['error_domain_empty'] = 'Δεν έχει οριστεί το Domain';
2122
$wb['error_ip_empty'] = 'Δεν έχει οριστεί ή IP.';
23+
$wb['error_ipv6_empty'] = 'Δεν έχει οριστεί ή IPv6.';
2224
$wb['error_ns1_empty'] = 'Δεν έχει οριστεί ο NS1.';
2325
$wb['error_ns2_empty'] = 'Δεν έχει οριστεί ο NS2.';
2426
$wb['error_email_empty'] = 'Δεν έχει οριστεί το EMail.';

‎interface/web/dns/lib/lang/en_dns_wizard.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ $wb['dkim_txt'] = 'DKIM enabled';
1313
$wb['ns1_txt'] = 'NS 1';
1414
$wb['ns2_txt'] = 'NS 2';
1515
$wb['ip_txt'] = 'IP Address';
16+
$wb['ipv6_txt'] = 'IPv6 Address';
1617
$wb['error_origin_empty'] = 'Origin empty.';
1718
$wb['error_ns_empty'] = 'NS empty.';
1819
$wb['error_mbox_empty'] = 'Mbox empty.';
@@ -23,6 +24,7 @@ $wb['error_minimum_empty'] = 'Minimum empty.';
2324
$wb['error_ttl_empty'] = 'TTL empty.';
2425
$wb['error_domain_empty'] = 'Domain empty';
2526
$wb['error_ip_empty'] = 'IP empty.';
27+
$wb['error_ipv6_empty'] = 'IPv6 empty.';
2628
$wb['error_ns1_empty'] = 'NS1 empty.';
2729
$wb['error_ns2_empty'] = 'NS2 empty.';
2830
$wb['error_email_empty'] = 'Email empty.';

‎interface/web/dns/lib/lang/es_dns_wizard.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $wb['email_txt'] = 'Correo';
99
$wb['ns1_txt'] = 'NS 1';
1010
$wb['ns2_txt'] = 'NS 2';
1111
$wb['ip_txt'] = 'Dirección IP';
12+
$wb['ipv6_txt'] = 'Dirección IPv6';
1213
$wb['error_origin_empty'] = 'El campo Origen está vacío.';
1314
$wb['error_ns_empty'] = 'El campo NS está vacío.';
1415
$wb['error_mbox_empty'] = 'El campo Mbox está vacío.';
@@ -19,6 +20,7 @@ $wb['error_minimum_empty'] = 'El campo Mínimo está vacío.';
1920
$wb['error_ttl_empty'] = 'El campo TTL está vacío.';
2021
$wb['error_domain_empty'] = 'El campo Dominio está vacío.';
2122
$wb['error_ip_empty'] = 'El campo IP está vacío.';
23+
$wb['error_ipv6_empty'] = 'El campo IPv6 está vacío.';
2224
$wb['error_ns1_empty'] = 'El campo NS1 está vacío.';
2325
$wb['error_ns2_empty'] = 'El campo NS2 está vacío.';
2426
$wb['error_email_empty'] = 'El campo Correo electrónico está vacío.';

0 commit comments

Comments
 (0)