- check for regular file when deleting old zonefiles (don't try to delete directories), fixes #147

This commit is contained in:
Michael Kaufmann (d00p)
2010-04-12 17:16:46 +00:00
parent ae27e06675
commit 98e79d933c

View File

@@ -149,10 +149,13 @@ class bind
while(false !== ($domain_filename = readdir($domain_file_dirhandle))) while(false !== ($domain_filename = readdir($domain_file_dirhandle)))
{ {
$full_filename = makeCorrectFile($domains_dir . '/' . $domain_filename);
if($domain_filename != '.' if($domain_filename != '.'
&& $domain_filename != '..' && $domain_filename != '..'
&& !in_array($domain_filename, $known_filenames) && !in_array($domain_filename, $known_filenames)
&& file_exists(makeCorrectFile($domains_dir . '/' . $domain_filename))) && is_file($full_filename)
&& file_exists($full_filename))
{ {
fwrite($this->debugHandler, ' cron_tasks: Task4 - unlinking ' . $domain_filename . "\n"); fwrite($this->debugHandler, ' cron_tasks: Task4 - unlinking ' . $domain_filename . "\n");
$this->logger->logAction(CRON_ACTION, LOG_WARNING, 'Deleting ' . $domain_filename); $this->logger->logAction(CRON_ACTION, LOG_WARNING, 'Deleting ' . $domain_filename);