tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Use getTempFolder() from core when checking for temp in installer.

Browse Source 
Fix for issue #2420. Instead of using custom temp folder discovery
code in the installer, use the core getTempFolder() instead.
This commit is contained in:
Sean Harvey 2013-11-01 13:53:53 +13:00
parent c547e426dd
commit fd2e7c1dd3
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dev/install/install.php5
View File

@ -84,6 +84,7 @@ if($envFileExists) {
} }
} }
require_once FRAMEWORK_NAME . '/core/Constants.php'; // this also includes TempPath.php
require_once FRAMEWORK_NAME . '/dev/install/DatabaseConfigurationHelper.php'; require_once FRAMEWORK_NAME . '/dev/install/DatabaseConfigurationHelper.php';
require_once FRAMEWORK_NAME . '/dev/install/DatabaseAdapterRegistry.php'; require_once FRAMEWORK_NAME . '/dev/install/DatabaseAdapterRegistry.php';
@ -444,7 +445,12 @@ class InstallRequirements {
} }
$this->requireWriteable('assets', array("File permissions", "Is the assets/ directory writeable?", null)); $this->requireWriteable('assets', array("File permissions", "Is the assets/ directory writeable?", null));
$tempFolder = $this->getTempFolder(); try {
$tempFolder = getTempFolder();
} catch(Exception $e) {
$tempFolder = false;
}
$this->requireTempFolder(array('File permissions', 'Is a temporary directory available?', null, $tempFolder)); $this->requireTempFolder(array('File permissions', 'Is a temporary directory available?', null, $tempFolder));
if($tempFolder) { if($tempFolder) {
// in addition to the temp folder being available, check it is writable // in addition to the temp folder being available, check it is writable
@ -956,32 +962,15 @@ class InstallRequirements {
} }
} }
function getTempFolder() {
$sysTmp = sys_get_temp_dir();
$worked = true;
$ssTmp = "$sysTmp/silverstripe-cache";
if(!@file_exists($ssTmp)) {
$worked = @mkdir($ssTmp);
}
if(!$worked) {
$ssTmp = dirname($_SERVER['SCRIPT_FILENAME']) . '/silverstripe-cache';
$worked = true;
if(!@file_exists($ssTmp)) {
$worked = @mkdir($ssTmp);
}
}
if($worked) return $ssTmp;
return false;
}
function requireTempFolder($testDetails) { function requireTempFolder($testDetails) {
$this->testing($testDetails); $this->testing($testDetails);
$tempFolder = $this->getTempFolder(); try {
$tempFolder = getTempFolder();
} catch(Exception $e) {
$tempFolder = false;
}
if(!$tempFolder) { if(!$tempFolder) {
$testDetails[2] = "Permission problem gaining access to a temp directory. " . $testDetails[2] = "Permission problem gaining access to a temp directory. " .
"Please create a folder named silverstripe-cache in the base directory " . "Please create a folder named silverstripe-cache in the base directory " .