Mark that the zone is managed, thus dkim can be auto added

Author: helmo

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';
+$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';

interface/web/mail/mail_domain_edit.php

@@ -259,6 +259,13 @@ function onShowEnd() {
 		$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 @@ function onAfterInsert() {
 
 		//* 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 @@ function onAfterUpdate() {
 			$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 @@ function onAfterUpdate() {
 
 	}
 
+	/**
+	 * 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;
 

interface/web/mail/templates/mail_domain_edit.htm

@@ -129,7 +129,7 @@
               </div>
 
               <div class="form-group">
-                <label for="dns_record" class="col-sm-3 control-label">{tmpl_var name='dkim_dns_txt'}</label>
+                <label for="dns_record" class="col-sm-3 control-label">{tmpl_var name='dkim_dns_txt'}<tmpl_if name='dkim_auto_dns'><br />{tmpl_var name='dkim_auto_dns'}</tmpl_if></label>
                 <div class="col-sm-9"><textarea class="form-control" name="dns_record" id="dns_record" rows='10' cols='30' readonly>{tmpl_var name='dns_record'}</textarea></div>
               </div>