Skip to content

Commit d57ffdc

Browse files
author
Marius Cramer
committed
Merge branch 'dns_delete_check' into 'master'
Dns delete check Now dns zone requires domain is created on domain module (if that feature is enabled), it should be checked as mail domain and web sites are checked.
2 parents 9664e7f + d021ef6 commit d57ffdc

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

interface/web/client/domain_del.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,18 @@ function onBeforeDelete() {
6262
*/
6363
$domain = $this->dataRecord['domain'];
6464

65+
$sql = "SELECT id FROM dns_soa WHERE origin = '" . $app->db->quote($domain.".") . "'";
66+
$res = $app->db->queryOneRecord($sql);
67+
if (is_array($res)){
68+
$app->error($wb['error_domain_in dnsuse']);
69+
}
70+
71+
$sql = "SELECT id FROM dns_slave WHERE origin = '" . $app->db->quote($domain.".") . "'";
72+
$res = $app->db->queryOneRecord($sql);
73+
if (is_array($res)){
74+
$app->error($wb['error_domain_in dnsslaveuse']);
75+
}
76+
6577
$sql = "SELECT domain_id FROM mail_domain WHERE domain = '" . $app->db->quote($domain) . "'";
6678
$res = $app->db->queryOneRecord($sql);
6779
if (is_array($res)){

interface/web/client/lib/lang/en.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ $wb['Edit Client Circle'] = 'Edit Client Circle';
1919
$wb['Domains'] = 'Domains';
2020
$wb['domain_txt'] = 'Domain';
2121
$wb['client_txt'] = 'Client';
22+
$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
23+
$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
2224
$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';
2325
$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain';
2426
$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain';

interface/web/client/lib/lang/es.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ $wb['Edit Client Circle'] = 'Editar círculo de clientes';
2020
$wb['Domains'] = 'Dominios';
2121
$wb['domain_txt'] = 'Dominio';
2222
$wb['client_txt'] = 'Cliente';
23+
$wb['error_domain_in dnsuse'] = 'No se puede eliminar este dominio, porque está en uso como zona dns';
24+
$wb['error_domain_in dnsslaveuse'] = 'No se puede eliminar este dominio, porque está en uso como zona dns secundaria';
2325
$wb['error_domain_in mailuse'] = 'No se puede eliminar este dominio, porque está en uso como dominio de correo';
2426
$wb['error_domain_in webuse'] = 'No se puede eliminar este dominio, porque está en uso como sitio web';
2527
$wb['error_client_can_not_add_domain'] = 'No puedes añadir más dominios';

0 commit comments

Comments
 (0)