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

check if path could be opened before iterating through it, fixes #1104

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2012-06-28 08:53:23 +02:00
parent d89856fac0
commit f5bc81faca
3 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1368,23 +1368,27 @@ 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 (is_array($known_phpfpm_files) if (is_array($known_phpfpm_files)
&& $phpfpm_filename != '.' && $phpfpm_filename != '.'
&& $phpfpm_filename != '..' && $phpfpm_filename != '..'
&& !in_array($phpfpm_filename, $known_phpfpm_files) && !in_array($phpfpm_filename, $known_phpfpm_files)
&& file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))) && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))
{ ) {
fwrite($this->debugHandler, ' apache::wipeOutOldVhostConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n"); fwrite($this->debugHandler, ' apache::wipeOutOldVhostConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n");
$this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename); $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename);
unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)); unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename));
} }
if(!is_array($known_phpfpm_files)) if (!is_array($known_phpfpm_files)) {
{
$this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM Configs Not written!!"); $this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM Configs Not written!!");
} }
} }
} else {
$this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM configuration path could not be read (".$this->settings['phpfpm']['configdir'].")");
}
} }
} }

21
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -1039,20 +1039,27 @@ class lighttpd
$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) {
{
if($phpfpm_filename != '.' while (false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle))) {
if (is_array($known_phpfpm_files)
&& $phpfpm_filename != '.'
&& $phpfpm_filename != '..' && $phpfpm_filename != '..'
&& !in_array($phpfpm_filename, $known_phpfpm_files) && !in_array($phpfpm_filename, $known_phpfpm_files)
&& file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))) && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))
{ ) {
fwrite($this->debugHandler, ' lighttpd::wipeOutOldConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n"); fwrite($this->debugHandler, ' lighttpd::wipeOutOldConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n");
$this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename); $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename);
unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)); unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename));
} }
if (!is_array($known_phpfpm_files)) {
$this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM Configs Not written!!");
}
}
} else {
$this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM configuration path could not be read (".$this->settings['phpfpm']['configdir'].")");
} }
} }
} }
} }
?>

19
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -1047,17 +1047,26 @@ class nginx
$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) {
{
if($phpfpm_filename != '.' while (false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle))) {
if (is_array($known_phpfpm_files)
&& $phpfpm_filename != '.'
&& $phpfpm_filename != '..' && $phpfpm_filename != '..'
&& !in_array($phpfpm_filename, $known_phpfpm_files) && !in_array($phpfpm_filename, $known_phpfpm_files)
&& file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))) && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))
{ ) {
fwrite($this->debugHandler, ' nginx::wipeOutOldVhostConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n"); fwrite($this->debugHandler, ' nginx::wipeOutOldVhostConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n");
$this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename); $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename);
unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)); unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename));
} }
if (!is_array($known_phpfpm_files)) {
$this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM Configs Not written!!");
}
}
} else {
$this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM configuration path could not be read (".$this->settings['phpfpm']['configdir'].")");
} }
} }
} }