Skip to content

Commit 8681150

Browse files
jnorelljnorell
committed
dns import: improvements in handling dns zone file syntax
1 parent f42ab5a commit 8681150

26 files changed

+517
-262
lines changed

‎interface/web/dns/dns_import.php‎

Lines changed: 253 additions & 223 deletions
Large diffs are not rendered by default.

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,22 @@ $wb['client_txt'] = 'Client';
44
$wb['btn_save_txt'] = 'Import Zonefile';
55
$wb['btn_cancel_txt'] = 'Cancel';
66
$wb['domain_txt'] = 'Domain';
7-
$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
8-
$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
7+
$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported.';
8+
$wb['error_no_valid_zone_file_txt'] = 'This zone file appears invalid.';
99
$wb['zonefile_to_import_txt'] = 'Zone File';
10-
$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
10+
$wb['domain_field_desc_txt'] = 'If empty, domain name is taken from SOA record.';
1111
$wb['title'] = 'Import Zone Files';
1212
$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
1313
$wb['zone_file_import_txt'] = 'Zone File Import';
1414
$wb['error_no_server_id'] = 'No server provided.';
1515
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
16+
$wb['zone_already_exists'] = 'This zone already exists, you must delete or rename it first.';
17+
$wb['zone_not_allowed'] = 'This zone is not allowed for this account.';
18+
$wb['zone_file_missing_soa'] = 'The zone file must contain a SOA record.';
19+
$wb['zone_file_multiple_soa'] = 'The zone file cannot contain multiple SOA records.';
20+
$wb['zone_file_soa_parser'] = 'The SOA record in this zone file could not be processed. Ensure SERIAL, REFRESH, RETRY, EXPIRE and MINIMUM are each on a separate line from other data.';
21+
$wb['ignore_record_not_class_in'] = 'Ignoring DNS record, not class IN.';
22+
$wb['ignore_record_unknown_type'] = 'Ignoring DNS record, unknown type.';
23+
$wb['ignore_record_invalid_owner'] = 'Ignoring DNS record, not able to validate owner name.';
24+
$wb['zone_file_import_fail'] = 'The zone file did not import.';
1625
?>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,13 @@ $wb['no_file_uploaded_error'] = 'Не е качен файла с зоната';
1313
$wb['zone_file_import_txt'] = 'Zone File Import';
1414
$wb['error_no_server_id'] = 'No server provided.';
1515
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
16+
$wb['zone_already_exists'] = 'This zone already exists, you must delete or rename it first.';
17+
$wb['zone_not_allowed'] = 'This zone is not allowed for this account.';
18+
$wb['zone_file_missing_soa'] = 'The zone file must contain a SOA record.';
19+
$wb['zone_file_multiple_soa'] = 'The zone file cannot contain multiple SOA records.';
20+
$wb['zone_file_soa_parser'] = 'The SOA record in this zone file could not be processed. Ensure SERIAL, REFRESH, RETRY, EXPIRE and MINIMUM are each on a separate line from other data.';
21+
$wb['ignore_record_not_class_in'] = 'Ignoring DNS record, not class IN.';
22+
$wb['ignore_record_unknown_type'] = 'Ignoring DNS record, unknown type.';
23+
$wb['ignore_record_invalid_owner'] = 'Ignoring DNS record, not able to validate owner name.';
24+
$wb['zone_file_import_fail'] = 'The zone file did not import.';
1625
?>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,13 @@ $wb['title'] = 'Importar arquivo de zona';
1313
$wb['no_file_uploaded_error'] = 'Nenhum arquivo de zona dns foi carregado.';
1414
$wb['error_no_server_id'] = 'Nenhum servidor foi informado.';
1515
$wb['error_not_allowed_server_id'] = 'O servidor selecionado não é permitido nesta conta.';
16+
$wb['zone_already_exists'] = 'This zone already exists, you must delete or rename it first.';
17+
$wb['zone_not_allowed'] = 'This zone is not allowed for this account.';
18+
$wb['zone_file_missing_soa'] = 'The zone file must contain a SOA record.';
19+
$wb['zone_file_multiple_soa'] = 'The zone file cannot contain multiple SOA records.';
20+
$wb['zone_file_soa_parser'] = 'The SOA record in this zone file could not be processed. Ensure SERIAL, REFRESH, RETRY, EXPIRE and MINIMUM are each on a separate line from other data.';
21+
$wb['ignore_record_not_class_in'] = 'Ignoring DNS record, not class IN.';
22+
$wb['ignore_record_unknown_type'] = 'Ignoring DNS record, unknown type.';
23+
$wb['ignore_record_invalid_owner'] = 'Ignoring DNS record, not able to validate owner name.';
24+
$wb['zone_file_import_fail'] = 'The zone file did not import.';
1625
?>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,13 @@ $wb['no_file_uploaded_error'] = 'Aucun fichier de Zone téléchargé';
1313
$wb['zone_file_import_txt'] = 'Importer un fichier de Zone';
1414
$wb['error_no_server_id'] = 'No server provided.';
1515
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
16+
$wb['zone_already_exists'] = 'This zone already exists, you must delete or rename it first.';
17+
$wb['zone_not_allowed'] = 'This zone is not allowed for this account.';
18+
$wb['zone_file_missing_soa'] = 'The zone file must contain a SOA record.';
19+
$wb['zone_file_multiple_soa'] = 'The zone file cannot contain multiple SOA records.';
20+
$wb['zone_file_soa_parser'] = 'The SOA record in this zone file could not be processed. Ensure SERIAL, REFRESH, RETRY, EXPIRE and MINIMUM are each on a separate line from other data.';
21+
$wb['ignore_record_not_class_in'] = 'Ignoring DNS record, not class IN.';
22+
$wb['ignore_record_unknown_type'] = 'Ignoring DNS record, unknown type.';
23+
$wb['ignore_record_invalid_owner'] = 'Ignoring DNS record, not able to validate owner name.';
24+
$wb['zone_file_import_fail'] = 'The zone file did not import.';
1625
?>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,13 @@ $wb['no_file_uploaded_error'] = 'Nelze odeslat DNS zonový soubor';
1313
$wb['zone_file_import_txt'] = 'Importovat DNS zonový soubor';
1414
$wb['error_no_server_id'] = 'No server provided.';
1515
$wb['error_not_allowed_server_id'] = 'Vybraný server není pro tento účet povolen.';
16+
$wb['zone_already_exists'] = 'This zone already exists, you must delete or rename it first.';
17+
$wb['zone_not_allowed'] = 'This zone is not allowed for this account.';
18+
$wb['zone_file_missing_soa'] = 'The zone file must contain a SOA record.';
19+
$wb['zone_file_multiple_soa'] = 'The zone file cannot contain multiple SOA records.';
20+
$wb['zone_file_soa_parser'] = 'The SOA record in this zone file could not be processed. Ensure SERIAL, REFRESH, RETRY, EXPIRE and MINIMUM are each on a separate line from other data.';
21+
$wb['ignore_record_not_class_in'] = 'Ignoring DNS record, not class IN.';
22+
$wb['ignore_record_unknown_type'] = 'Ignoring DNS record, unknown type.';
23+
$wb['ignore_record_invalid_owner'] = 'Ignoring DNS record, not able to validate owner name.';
24+
$wb['zone_file_import_fail'] = 'The zone file did not import.';
1625
?>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,13 @@ $wb['title'] = 'Zonen Datei importieren';
1313
$wb['no_file_uploaded_error'] = 'Keine Datei hochgeladen';
1414
$wb['error_no_server_id'] = 'No server provided.';
1515
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
16+
$wb['zone_already_exists'] = 'This zone already exists, you must delete or rename it first.';
17+
$wb['zone_not_allowed'] = 'This zone is not allowed for this account.';
18+
$wb['zone_file_missing_soa'] = 'The zone file must contain a SOA record.';
19+
$wb['zone_file_multiple_soa'] = 'The zone file cannot contain multiple SOA records.';
20+
$wb['zone_file_soa_parser'] = 'The SOA record in this zone file could not be processed. Ensure SERIAL, REFRESH, RETRY, EXPIRE and MINIMUM are each on a separate line from other data.';
21+
$wb['ignore_record_not_class_in'] = 'Ignoring DNS record, not class IN.';
22+
$wb['ignore_record_unknown_type'] = 'Ignoring DNS record, unknown type.';
23+
$wb['ignore_record_invalid_owner'] = 'Ignoring DNS record, not able to validate owner name.';
24+
$wb['zone_file_import_fail'] = 'The zone file did not import.';
1625
?>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,13 @@ $wb['title'] = 'Importer Zone Filer';
1313
$wb['no_file_uploaded_error'] = 'Ingen zone-fil overført';
1414
$wb['error_no_server_id'] = 'No server provided.';
1515
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
16+
$wb['zone_already_exists'] = 'This zone already exists, you must delete or rename it first.';
17+
$wb['zone_not_allowed'] = 'This zone is not allowed for this account.';
18+
$wb['zone_file_missing_soa'] = 'The zone file must contain a SOA record.';
19+
$wb['zone_file_multiple_soa'] = 'The zone file cannot contain multiple SOA records.';
20+
$wb['zone_file_soa_parser'] = 'The SOA record in this zone file could not be processed. Ensure SERIAL, REFRESH, RETRY, EXPIRE and MINIMUM are each on a separate line from other data.';
21+
$wb['ignore_record_not_class_in'] = 'Ignoring DNS record, not class IN.';
22+
$wb['ignore_record_unknown_type'] = 'Ignoring DNS record, unknown type.';
23+
$wb['ignore_record_invalid_owner'] = 'Ignoring DNS record, not able to validate owner name.';
24+
$wb['zone_file_import_fail'] = 'The zone file did not import.';
1625
?>

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,22 @@ $wb['client_txt'] = 'Client';
44
$wb['btn_save_txt'] = 'Import Zonefile';
55
$wb['btn_cancel_txt'] = 'Cancel';
66
$wb['domain_txt'] = 'Domain';
7-
$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
8-
$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
7+
$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported.';
8+
$wb['error_no_valid_zone_file_txt'] = 'This zone file appears invalid.';
99
$wb['zonefile_to_import_txt'] = 'Zone File';
10-
$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
10+
$wb['domain_field_desc_txt'] = 'If empty, domain name is taken from SOA record.';
1111
$wb['title'] = 'Import Zone Files';
1212
$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
1313
$wb['zone_file_import_txt'] = 'Zone File Import';
1414
$wb['error_no_server_id'] = 'No server provided.';
1515
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
16+
$wb['zone_already_exists'] = 'This zone already exists, you must delete or rename it first.';
17+
$wb['zone_not_allowed'] = 'This zone is not allowed for this account.';
18+
$wb['zone_file_missing_soa'] = 'The zone file must contain a SOA record.';
19+
$wb['zone_file_multiple_soa'] = 'The zone file cannot contain multiple SOA records.';
20+
$wb['zone_file_soa_parser'] = 'The SOA record in this zone file could not be processed. Ensure SERIAL, REFRESH, RETRY, EXPIRE and MINIMUM are each on a separate line from other data.';
21+
$wb['ignore_record_not_class_in'] = 'Ignoring DNS record, not class IN.';
22+
$wb['ignore_record_unknown_type'] = 'Ignoring DNS record, unknown type.';
23+
$wb['ignore_record_invalid_owner'] = 'Ignoring DNS record, not able to validate owner name.';
24+
$wb['zone_file_import_fail'] = 'The zone file did not import.';
1625
?>

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,21 @@ $wb['client_txt'] = 'Client';
55
$wb["btn_save_txt"] = 'Import Zonefile';
66
$wb["btn_cancel_txt"] = 'Cancel';
77
$wb['domain_txt'] = 'Domain';
8-
$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
9-
$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
8+
$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported.';
9+
$wb['error_no_valid_zone_file_txt'] = 'This zone file appears invalid.';
1010
$wb['zonefile_to_import_txt'] = 'Zone File';
11-
$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
11+
$wb['domain_field_desc_txt'] = 'If empty, domain name is taken from SOA record.';
1212
$wb['title'] = 'Import Zone Files';
13-
$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
13+
$wb['no_file_uploaded_error'] = 'No zonefile uploaded.';
1414
$wb['error_no_server_id'] = 'No server provided.';
1515
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
16-
?>
16+
$wb['zone_already_exists'] = 'This zone already exists, you must delete or rename it first.';
17+
$wb['zone_not_allowed'] = 'This zone is not allowed for this account.';
18+
$wb['zone_file_missing_soa'] = 'The zone file must contain a SOA record.';
19+
$wb['zone_file_multiple_soa'] = 'The zone file cannot contain multiple SOA records.';
20+
$wb['zone_file_soa_parser'] = 'The SOA record in this zone file could not be processed. Ensure SERIAL, REFRESH, RETRY, EXPIRE and MINIMUM are each on a separate line from other data.';
21+
$wb['ignore_record_not_class_in'] = 'Ignoring DNS record, not class IN.';
22+
$wb['ignore_record_unknown_type'] = 'Ignoring DNS record, unknown type.';
23+
$wb['ignore_record_invalid_owner'] = 'Ignoring DNS record, not able to validate owner name.';
24+
$wb['zone_file_import_fail'] = 'The zone file did not import.';
25+
?>

0 commit comments

Comments
 (0)