diff --git a/interface/web/mail/lib/lang/ar_mail_domain.lng b/interface/web/mail/lib/lang/ar_mail_domain.lng index e53c5d9ec217cb583a70dd6237d8c3d8484bc0a4..aec7f401e5225f782fda5e8e2c8d0ff6653e21a3 100644 --- a/interface/web/mail/lib/lang/ar_mail_domain.lng +++ b/interface/web/mail/lib/lang/ar_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/bg_mail_domain.lng b/interface/web/mail/lib/lang/bg_mail_domain.lng index f2d329a62ec96e1a1a5afbea6af63694f3977503..003d54de712a23337d1b71eb69fb599bed54ae8a 100644 --- a/interface/web/mail/lib/lang/bg_mail_domain.lng +++ b/interface/web/mail/lib/lang/bg_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/br_mail_domain.lng b/interface/web/mail/lib/lang/br_mail_domain.lng index 7371f51894a2af03bbbdb6497ce85f513e0b78bc..48cb66f57b07a60ca56480c6276243cb3dc8d95a 100644 --- a/interface/web/mail/lib/lang/br_mail_domain.lng +++ b/interface/web/mail/lib/lang/br_mail_domain.lng @@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'Seletor DKIM é inválido. Utilize apenas caracter $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/ca_mail_domain.lng b/interface/web/mail/lib/lang/ca_mail_domain.lng index 0b701a16c3ef8443fee0ea3bf26c271f8cad4aee..a22ce61178fb00d91d7ad15c83094a19bd6cfa93 100644 --- a/interface/web/mail/lib/lang/ca_mail_domain.lng +++ b/interface/web/mail/lib/lang/ca_mail_domain.lng @@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanu $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/cn_mail_domain.lng b/interface/web/mail/lib/lang/cn_mail_domain.lng index 279e9a3bf76777b6fafe795f9cbe691a5d610fc6..59c60340b3f46340c52584ff00ac1fec282eff3f 100644 --- a/interface/web/mail/lib/lang/cn_mail_domain.lng +++ b/interface/web/mail/lib/lang/cn_mail_domain.lng @@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = '无效的 DKIM 选择器。仅使用小写字母 $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost 用户'; $wb['relayhost_password_txt'] = 'Relayhost 密码'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng index 0c648a68f33aadf8b14163aa7c33ec95459d7f91..546e27cfbe29bd24a21e3f6648cb3f0d348a44b7 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Zvolený server není povolen pro tento ú $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng index 0a972caa42f76e7bf8d5abf467f826ec157bd18d..e49b66358ac6d123cf14de6c2ac87b22f4c66708 100644 --- a/interface/web/mail/lib/lang/de_mail_domain.lng +++ b/interface/web/mail/lib/lang/de_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/dk_mail_domain.lng b/interface/web/mail/lib/lang/dk_mail_domain.lng index fcced58e1addb02e3fe37353f642a2f51cb2bff2..64058ef18aef98a086f47d9d6919b361f997bb4d 100644 --- a/interface/web/mail/lib/lang/dk_mail_domain.lng +++ b/interface/web/mail/lib/lang/dk_mail_domain.lng @@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanu $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng index 3909576a3c8d36cbdb1cc5b2e9d40a347eb16091..1086651b1681f7ccb06ce79921e011301e231fe6 100644 --- a/interface/web/mail/lib/lang/el_mail_domain.lng +++ b/interface/web/mail/lib/lang/el_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/en_mail_domain.lng b/interface/web/mail/lib/lang/en_mail_domain.lng index fe4cad303f8253de066f5edb2b24a831c78e99c9..3ac49dd8c69c02e0e6b90e3c8f432e53ffa53e66 100644 --- a/interface/web/mail/lib/lang/en_mail_domain.lng +++ b/interface/web/mail/lib/lang/en_mail_domain.lng @@ -20,6 +20,7 @@ $wb['no_policy'] = '- not enabled -'; $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.'; $wb['dkim_selector_txt'] = 'DKIM-Selector'; $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars, optional followed by a period and by another string of no more than 63 lower-case alphanumeric characters.'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; diff --git a/interface/web/mail/lib/lang/es_mail_domain.lng b/interface/web/mail/lib/lang/es_mail_domain.lng index 4a3feb7c8b9132b80312aee885d526d6676f45b5..81d0939b89eb2e15ecb7c38a7b1caffe0a4e4d60 100644 --- a/interface/web/mail/lib/lang/es_mail_domain.lng +++ b/interface/web/mail/lib/lang/es_mail_domain.lng @@ -23,3 +23,4 @@ $wb['type_txt'] = 'Tipo'; $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/fi_mail_domain.lng b/interface/web/mail/lib/lang/fi_mail_domain.lng index d77fe325004fddf591bef88d176a6b865995bfe2..8ecd3f6718f93d0b2b5e4ade4c1952fe5c53dc97 100644 --- a/interface/web/mail/lib/lang/fi_mail_domain.lng +++ b/interface/web/mail/lib/lang/fi_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/fr_mail_domain.lng b/interface/web/mail/lib/lang/fr_mail_domain.lng index 56efb88aae308647e2e0c041a0e089301dc05d45..6cf3e060f8f06250b74274f3fb4a4578bd1302d0 100644 --- a/interface/web/mail/lib/lang/fr_mail_domain.lng +++ b/interface/web/mail/lib/lang/fr_mail_domain.lng @@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanu $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/hr_mail_domain.lng b/interface/web/mail/lib/lang/hr_mail_domain.lng index 2f53c694c80f79bef6ac8bdd811cfa8068ee4530..2404324f04ef7190dcdd6598c97fbc85e43a66da 100644 --- a/interface/web/mail/lib/lang/hr_mail_domain.lng +++ b/interface/web/mail/lib/lang/hr_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/hu_mail_domain.lng b/interface/web/mail/lib/lang/hu_mail_domain.lng index 96a5dc03a51233e168098b6e9d655e98f57bd0c9..faf5eae4aee34d7cb4e2788fc9e6eff13a525932 100644 --- a/interface/web/mail/lib/lang/hu_mail_domain.lng +++ b/interface/web/mail/lib/lang/hu_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/id_mail_domain.lng b/interface/web/mail/lib/lang/id_mail_domain.lng index 2979773e8c9183af092abba17b866cb5390bc0e4..f8c2d7c5162c6df00d5220b2f84569b735233af3 100644 --- a/interface/web/mail/lib/lang/id_mail_domain.lng +++ b/interface/web/mail/lib/lang/id_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/it_mail_domain.lng b/interface/web/mail/lib/lang/it_mail_domain.lng index 13af4beb97034dcd5c97a0da15e23613109b11ec..75c8a7b6a4f1c5695942ee1e3dd649cee7af3784 100644 --- a/interface/web/mail/lib/lang/it_mail_domain.lng +++ b/interface/web/mail/lib/lang/it_mail_domain.lng @@ -23,4 +23,5 @@ $wb['dkim_selector_error'] = 'Selettore di chiave DKIM invalido. Usare solo cara $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Utente Relayhost'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; ?> diff --git a/interface/web/mail/lib/lang/ja_mail_domain.lng b/interface/web/mail/lib/lang/ja_mail_domain.lng index a96faaa367643c34ad2168927d2e26042cff8456..9713c8d7341486794f144c27571197de2a108119 100644 --- a/interface/web/mail/lib/lang/ja_mail_domain.lng +++ b/interface/web/mail/lib/lang/ja_mail_domain.lng @@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanu $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng index 0e8a912a71dc814f48a3dde7bed991b187a7b2ae..97ecca773dc8b802882c48d3e09e3fd24241f834 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Beheerde zone, dns update automatisch'; diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng index 7ff3c297fff625d0dcaba6a4d48e14b44ca6eb54..cba78dc309ec645c5c1de0a118aba59ee57173e1 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/pt_mail_domain.lng b/interface/web/mail/lib/lang/pt_mail_domain.lng index 092f83f1cacc166cfb067a88b35a1ff969d563a2..16ff402ded5c96a1693839a329da250d31b8984b 100644 --- a/interface/web/mail/lib/lang/pt_mail_domain.lng +++ b/interface/web/mail/lib/lang/pt_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/ro_mail_domain.lng b/interface/web/mail/lib/lang/ro_mail_domain.lng index e0543f36ec34696741999ef853fe58e730469e33..dce3c99ceb9fd4c074c3f054cffe2f4bf9ea6271 100644 --- a/interface/web/mail/lib/lang/ro_mail_domain.lng +++ b/interface/web/mail/lib/lang/ro_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/ru_mail_domain.lng b/interface/web/mail/lib/lang/ru_mail_domain.lng index 7567e3c67021d8976ced17565929119aa8e42424..af76a508fb8c406d706a161ef5eb521b57db3d57 100644 --- a/interface/web/mail/lib/lang/ru_mail_domain.lng +++ b/interface/web/mail/lib/lang/ru_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Выбранный сервер не до $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/se_mail_domain.lng b/interface/web/mail/lib/lang/se_mail_domain.lng index 7f192224e672a07b7e62cb5a38a2cfe14574df50..ec787116f621320065994c204be4b808eaf7c504 100644 --- a/interface/web/mail/lib/lang/se_mail_domain.lng +++ b/interface/web/mail/lib/lang/se_mail_domain.lng @@ -23,3 +23,4 @@ $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this acco $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/sk_mail_domain.lng b/interface/web/mail/lib/lang/sk_mail_domain.lng index ed67d200441cfe685faeac5f4f4a19e1c6602134..7527ba1d65d2001a7a50e9dae8cf343ae8629c93 100644 --- a/interface/web/mail/lib/lang/sk_mail_domain.lng +++ b/interface/web/mail/lib/lang/sk_mail_domain.lng @@ -23,3 +23,4 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector'; $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/lib/lang/tr_mail_domain.lng b/interface/web/mail/lib/lang/tr_mail_domain.lng index 802fdcf94b8ee1bc3262484864fb09116a868213..8ada2139b0f6e20d5367bcc2b242f134711a1152 100644 --- a/interface/web/mail/lib/lang/tr_mail_domain.lng +++ b/interface/web/mail/lib/lang/tr_mail_domain.lng @@ -23,3 +23,4 @@ $wb['dkim_selector_error'] = 'DKIM seçici geçersiz. En fazla 63 karakter uzunl $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost User'; $wb['relayhost_password_txt'] = 'Relayhost Password'; +$wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically'; diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index f5697b4f1c27fea3680d93dc3758675eb850e972..ab9fc88a6534d97c91429439bab0a1d69f9c2b85 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -259,6 +259,13 @@ class page_action extends tform_actions { $app->tpl->setVar('dkim_public', $rec['dkim_public'], true); if (!empty($rec['dkim_public'])) $app->tpl->setVar('dns_record', $dns_record, true); + if($this->id > 0) { + $soa = $this->find_soa_domain($this->dataRecord['domain']); + if ( !empty($soa) ) { + $app->tpl->setVar('dkim_auto_dns', $app->tform->lng('dkim_auto_dns_txt'), true); + } + } + $csrf_token = $app->auth->csrf_token_get('mail_domain_del'); $app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']); $app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']); @@ -372,12 +379,8 @@ class page_action extends tform_actions { //* create dns-record with dkim-values if the zone exists if ( $this->dataRecord['active'] == 'y' && $this->dataRecord['dkim'] == 'y' ) { - $soaDomain = $this->dataRecord['domain'].'.'; - while ((!isset($soa) && (substr_count($soaDomain,'.') > 1))) { - $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $soaDomain); - $soaDomain = preg_replace("/^[^\.]+\./","",$soaDomain); - } - if ( isset($soa) && !empty($soa) ) $this->update_dns($this->dataRecord, $soa); + $soa = $this->find_soa_domain($this->dataRecord['domain']); + if ( !empty($soa) ) $this->update_dns($this->dataRecord, $soa); } } @@ -690,15 +693,11 @@ class page_action extends tform_actions { $selector = @($this->dataRecord['dkim_selector'] != $this->oldDataRecord['dkim_selector']) ? true : false; $dkim_private = @($this->dataRecord['dkim_private'] != $this->oldDataRecord['dkim_private']) ? true : false; - $soaDomain = $domain.'.'; - while ((!isset($soa) && (substr_count($soaDomain,'.') > 1))) { - $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $soaDomain); - $soaDomain = preg_replace("/^[^\.]+\./","",$soaDomain); - } + $soa = $this->find_soa_domain($this->dataRecord['domain']); if ( ($selector || $dkim_private || $dkim_active) && $dkim_active ) //* create a new record only if the dns-zone exists - if ( isset($soa) && !empty($soa) ) { + if ( !empty($soa) ) { $this->update_dns($this->dataRecord, $soa); } if (! $dkim_active) { @@ -718,6 +717,20 @@ class page_action extends tform_actions { } + /** + * Lookup if we host a dns zone for this domain. + */ + private function find_soa_domain($domain) { + global $app; + $soaDomain = $domain . '.'; + $soa = null; + while ((!isset($soa) && (substr_count($soaDomain,'.') > 1))) { + $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $soaDomain); + $soaDomain = preg_replace("/^[^\.]+\./","",$soaDomain); + } + return $soa; + } + private function update_dns($dataRecord, $new_rr) { global $app, $conf; diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm index cc7031b7870d120c649ec2e1d688f21eb468921a..2d8d14536ce7cbc5562d27b0a1479c5e2fa98bce 100644 --- a/interface/web/mail/templates/mail_domain_edit.htm +++ b/interface/web/mail/templates/mail_domain_edit.htm @@ -129,7 +129,7 @@
- +