Skip to content

Commit 8a46bee

Browse files
committed
allow multiple master-server for a bind-slave
1 parent dad304a commit 8a46bee

28 files changed

+35
-26
lines changed

interface/web/dns/dns_wizard.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@
421421
"dnssec_wanted" => $enable_dnssec
422422
);
423423
$dns_soa_id = $app->db->datalogInsert('dns_soa', $insert_data, 'id');
424+
if($dns_soa_id > 0) $app->plugin->raiseEvent('dns:wizard:on_after_insert', $dns_soa_id);
424425

425426
// Insert the dns_rr records
426427
if(is_array($dns_rr) && $dns_soa_id > 0) {

interface/web/dns/form/dns_slave.tform.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,16 @@
108108
'ns' => array (
109109
'datatype' => 'VARCHAR',
110110
'formtype' => 'TEXT',
111+
/*
111112
'validators' => array ( 0 => array ( 'type' => 'REGEX',
112113
'regex' => '/^[0-9\.]{1,255}$/',
113114
'errmsg'=> 'ns_error_regex'),
114115
),
116+
*/
117+
'validators' => array ( 0 => array ( 'type' => 'ISIP',
118+
'separator' => ',',
119+
'errmsg'=> 'ns_error_regex'),
120+
),
115121
'default' => '',
116122
'value' => '',
117123
'width' => '30',

interface/web/dns/lib/lang/ar_dns_slave.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
1212
$wb['origin_error_regex'] = 'Zone has a invalid format.';
1313
$wb['ns_error_regex'] = 'NS has a invalid format.';
1414
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
15-
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
15+
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
1616
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
1717
?>

interface/web/dns/lib/lang/bg_dns_slave.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Вече има запис за тази зона.
1212
$wb['origin_error_regex'] = 'Името на зоната е в грешен формат.';
1313
$wb['ns_error_regex'] = 'NS е в грешен формат.';
1414
$wb['eg_domain_tld'] = 'примерно domain.tld.';
15-
$wb['ipv4_form_txt'] = 'IPv4 формата изглейда така: 1.2.3.4';
15+
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
1616
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
1717
?>

interface/web/dns/lib/lang/br_dns_slave.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Já existe um registro igual para esta zona.';
1212
$wb['origin_error_regex'] = 'Zona inválida.';
1313
$wb['ns_error_regex'] = 'Registro NS inválido.';
1414
$wb['eg_domain_tld'] = 'ex.: dominio.com.';
15-
$wb['ipv4_form_txt'] = 'Formato IPv4 - ex.: 1.2.3.4';
15+
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
1616
$wb['secondary_zone_txt'] = 'Zona dns secundária';
1717
?>

interface/web/dns/lib/lang/ca_dns_slave.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Il y a déjà un enregistrement pour cette zone.';
1212
$wb['origin_error_regex'] = 'Le format de la zone est invalide.';
1313
$wb['ns_error_regex'] = 'Le format de l\'enregistrement NS est invalide.';
1414
$wb['eg_domain_tld'] = 'ex. domain.tld.';
15-
$wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4';
15+
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
1616
$wb['secondary_zone_txt'] = 'Zone DNS secondaire';
1717
?>

interface/web/dns/lib/lang/cz_dns_slave.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Pro tuto zónu již existuje záznam.';
1212
$wb['origin_error_regex'] = 'Zóna má neplatný formát.';
1313
$wb['ns_error_regex'] = 'NS má neplatný formát.';
1414
$wb['eg_domain_tld'] = 'např. domena.cz';
15-
$wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4';
15+
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
1616
$wb['secondary_zone_txt'] = 'Sekundární DNS zóna';
1717
?>

interface/web/dns/lib/lang/de_dns_slave.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ $wb['origin_error_unique'] = 'Es existiert bereits ein Eintrag für diese Zone.'
1313
$wb['origin_error_regex'] = 'Zone hat ein ungültiges Format.';
1414
$wb['ns_error_regex'] = 'NS hat ein ungültiges Format.';
1515
$wb['eg_domain_tld'] = 'Format: domain.tld.';
16-
$wb['ipv4_form_txt'] = 'IPv4 Format: 1.2.3.4';
16+
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
1717
?>

interface/web/dns/lib/lang/dk_dns_slave.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ $wb['origin_error_unique'] = 'Der findes allerede en post for denne zone.';
1313
$wb['origin_error_regex'] = 'Zone har et ugyldigt format.';
1414
$wb['ns_error_regex'] = 'NS har et ugyldigt format.';
1515
$wb['eg_domain_tld'] = 'f.eks. domæne.tld.';
16-
$wb['ipv4_form_txt'] = 'IPv4 form - f.eks. 1.2.3.4';
16+
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
1717
?>

interface/web/dns/lib/lang/el_dns_slave.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Υπάρχει ήδη μια εγγραφή για
1212
$wb['origin_error_regex'] = 'Η ζώνη δεν έχει έγκυρη μορφοποίηση.';
1313
$wb['ns_error_regex'] = 'Ο NS δεν έχει έγκυρη μορφοποίηση.';
1414
$wb['eg_domain_tld'] = 'π.χ. domain.tld.';
15-
$wb['ipv4_form_txt'] = 'μορφή IPv4 - π.χ. 1.2.3.4';
15+
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
1616
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
1717
?>

0 commit comments

Comments
 (0)