maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix #1615

Browse Source
This commit is contained in:
Daniel Reichelt
2016-04-10 02:56:06 +02:00
committed by Daniel Reichelt
parent 5331127204
commit 576c94f83c
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/jobs/cron_tasks.inc.dns.10.bind.php
View File

@@ -203,7 +203,8 @@ class bind {
$subzones.= $this->walkDomainList($domains[$child_domain_id], $domains); $subzones.= $this->walkDomainList($domains[$child_domain_id], $domains);
} }
if ($domain['ismainbutsubto'] == 0 && $domain['zonefile'] == '') { if ($domain['zonefile'] == '') {
if ($domain['ismainbutsubto'] == 0) {
$zonefile = $this->generateZone($domain); $zonefile = $this->generateZone($domain);
$domain['zonefile'] = 'domains/' . $domain['domain'] . '.zone'; $domain['zonefile'] = 'domains/' . $domain['domain'] . '.zone';
$zonefile_name = makeCorrectFile(Settings::Get('system.bindconf_directory') . '/' . $domain['zonefile']); $zonefile_name = makeCorrectFile(Settings::Get('system.bindconf_directory') . '/' . $domain['zonefile']);
@@ -212,11 +213,13 @@ class bind {
fwrite($zonefile_handler, $zonefile.$subzones); fwrite($zonefile_handler, $zonefile.$subzones);
fclose($zonefile_handler); fclose($zonefile_handler);
$this->logger->logAction(CRON_ACTION, LOG_INFO, '`' . $zonefile_name . '` zone written'); $this->logger->logAction(CRON_ACTION, LOG_INFO, '`' . $zonefile_name . '` zone written');
$this->_bindconf_file .= $this->_generateDomainConfig($domain);
} else { } else {
return $this->generateZone($domain); return $this->generateZone($domain);
} }
} else {
if ($zonefile !== '') { $this->logger->logAction(CRON_ACTION, LOG_INFO, 'Added zonefile ' . $domain['zonefile'] . ' for domain ' . $domain['domain'] .
' - Note that you will also have to handle ALL records for ALL subdomains.');
$this->_bindconf_file .= $this->_generateDomainConfig($domain); $this->_bindconf_file .= $this->_generateDomainConfig($domain);
} }
} }