From 5d6299e3c82ba57b7506ec5ad467e31044ecf384 Mon Sep 17 00:00:00 2001 From: MicroVB INC Date: Wed, 16 Mar 2016 18:16:02 -0400 Subject: [PATCH 1/2] Fix enumeration warning when localhost missing Corrects the following error : scandir(/var/www/html/ice/lib/../backups/localhost): failed to open dir: No such file or directory in /var/www/html/ice/lib/settings-common.php on line 190 (possible review required for if this is something that should be created before this method is called, or if a simple check as this patch does is all that is required.) --- lib/settings-common.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/settings-common.php b/lib/settings-common.php index cdd7198..6f6813f 100644 --- a/lib/settings-common.php +++ b/lib/settings-common.php @@ -185,10 +185,18 @@ function getVersionsCount($fileLoc,$fileName) { global $context; $count = 0; $dateCounts = array(); + $backupDateDirs = array(); // Establish the base, host and date dirs within... $backupDirBase = str_replace("\\","/",dirname(__FILE__))."/../backups/"; $backupDirHost = isset($ftpSite) ? parse_url($ftpSite,PHP_URL_HOST) : "localhost"; - $backupDateDirs = scandir($backupDirBase.$backupDirHost,1); + // check if folder exists if local before enumerating contents + if(!isset($ftpsite)) { + if(file_exists($backupDirBase.$backupDirHost) && is_dir($backupDirBase.$backupDirHost)) { + $backupDateDirs = scandir($backupDirBase.$backupDirHost,1); + } + } else { + $backupDateDirs = scandir($backupDirBase.$backupDirHost,1); + } // Get rid of . and .. from date dirs array for ($i=0; $i Date: Wed, 16 Mar 2016 18:20:22 -0400 Subject: [PATCH 2/2] Update settings-common.php --- lib/settings-common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/settings-common.php b/lib/settings-common.php index 6f6813f..669a4d8 100644 --- a/lib/settings-common.php +++ b/lib/settings-common.php @@ -190,7 +190,7 @@ function getVersionsCount($fileLoc,$fileName) { $backupDirBase = str_replace("\\","/",dirname(__FILE__))."/../backups/"; $backupDirHost = isset($ftpSite) ? parse_url($ftpSite,PHP_URL_HOST) : "localhost"; // check if folder exists if local before enumerating contents - if(!isset($ftpsite)) { + if(!isset($ftpSite)) { if(file_exists($backupDirBase.$backupDirHost) && is_dir($backupDirBase.$backupDirHost)) { $backupDateDirs = scandir($backupDirBase.$backupDirHost,1); }