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

Merge pull request #51 from SirUli/master

Browse Source 
Fix for cron_tasks.inc.http.10.apache.php on 1315
This commit is contained in:
Florian Aders
2012-09-25 00:27:17 -07:00
parent 30b185825c bd890e8ebe
commit ec537625a5
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -1312,17 +1312,21 @@ class apache
$configdir = $this->settings['phpfpm']['configdir']; $configdir = $this->settings['phpfpm']['configdir'];
$phpfpm_file_dirhandle = opendir($this->settings['phpfpm']['configdir']); $phpfpm_file_dirhandle = opendir($this->settings['phpfpm']['configdir']);
while(false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle))) if ($phpfpm_file_dirhandle !== false) {
{ while(false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle)))
if($phpfpm_filename != '.' {
&& $phpfpm_filename != '..' if($phpfpm_filename != '.'
&& !in_array($phpfpm_filename, $known_phpfpm_files) && $phpfpm_filename != '..'
&& file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))) && !in_array($phpfpm_filename, $known_phpfpm_files)
{ && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)))
fwrite($this->debugHandler, ' apache::wipeOutOldVhostConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n"); {
$this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename); fwrite($this->debugHandler, ' apache::wipeOutOldVhostConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n");
unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)); $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename);
} unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename));
}
}
} else {
$this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM configuration path could not be read (".$this->settings['phpfpm']['configdir'].")");
} }
} }
} }