tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUGFIX #4661 Fix SS temporary directory bug with Windows environments - the directory would always be "silverstripe-cache" instead of a namespaced one so that multiple SS sites don't conflict with eachother (from r94134) 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95588 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-12-16 05:36:35 +00:00
parent 0cc0d3c767
commit b39b85fe58
2 changed files with 79 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/Core.php
View File

@ -179,22 +179,7 @@ Debug::loadErrorHandlers();
///////////////////////////////////////////////////////////////////////////////
// HELPER FUNCTIONS
/**
* Returns the temporary folder that sapphire/silverstripe should use for its cache files
* This is loaded into the TEMP_FOLDER define on start up
*/
function getTempFolder() {
if(preg_match('/^(.*)\/sapphire\/[^\/]+$/', $_SERVER['SCRIPT_FILENAME'], $matches)) {
$cachefolder = "silverstripe-cache" . str_replace(array(' ',"/",":", "\\"),"-", $matches[1]);
} else {
$cachefolder = "silverstripe-cache";
}
$ssTmp = BASE_PATH . "/silverstripe-cache";
if(@file_exists($ssTmp)) {
return $ssTmp;
}
function getSysTempDir() {
if(function_exists('sys_get_temp_dir')) {
$sysTmp = sys_get_temp_dir();
} elseif(isset($_ENV['TMP'])) {
@ -204,6 +189,26 @@ function getTempFolder() {
unlink($tmpFile);
$sysTmp = dirname($tmpFile);
}
return $sysTmp;
}
/**
* Returns the temporary folder that sapphire/silverstripe should use for its cache files
* This is loaded into the TEMP_FOLDER define on start up
*/
function getTempFolder() {
if(preg_match('/^(.*)[\/\\\\]sapphire[\/\\\\][^\/\\\\]+$/', $_SERVER['SCRIPT_FILENAME'], $matches)) {
$cachefolder = "silverstripe-cache" . str_replace(array(' ', "/", ":", "\\"), "-", $matches[1]);
} else {
$cachefolder = "silverstripe-cache";
}
$ssTmp = BASE_PATH . "/silverstripe-cache";
if(@file_exists($ssTmp)) {
return $ssTmp;
}
$sysTmp = getSysTempDir();
$worked = true;
$ssTmp = "$sysTmp/$cachefolder";

58
tests/CoreTest.php Normal file
View File

@ -0,0 +1,58 @@
<?php
/**
* Tests for the core of sapphire, such as how the temporary
* directory is determined throughout the framework.
*
* @package sapphire
* @subpackage tests
*/
class CoreTest extends SapphireTest {
protected $tempPath, $renamedTempPath;
public function setUp() {
parent::setUp();
$this->tempPath = $tempPath = Director::baseFolder() . '/silverstripe-cache';
$this->renamedTempPath = $renamedTempPath = Director::baseFolder() . '/silverstripe-cache-1';
// If the test failed (PHP error) this will need to be renamed
if(file_exists($renamedTempPath)) {
rename($renamedTempPath, $tempPath);
}
if(!file_exists($tempPath)) {
mkdir($tempPath);
}
}
public function testGetTempPathInProject() {
$this->assertEquals(getTempFolder(), $this->tempPath);
rename($this->tempPath, $this->tempPath . '-1');
// Store the original variable so we know what to change it back to
$old = $_SERVER['SCRIPT_FILENAME'];
// A typical Windows location for where sites are stored on IIS
$_SERVER['SCRIPT_FILENAME'] = 'C:\inetpub\wwwroot\silverstripe\sapphire\main.php';
$this->assertEquals(getTempFolder(), getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe');
// A typical Mac OS X location for where sites are stored
$_SERVER['SCRIPT_FILENAME'] = '/Users/joebloggs/Sites/silverstripe/sapphire/main.php';
$this->assertEquals(getTempFolder(), getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe');
// A typical Linux location for where sites are stored
$_SERVER['SCRIPT_FILENAME'] = '/var/www/silverstripe/sapphire/main.php';
$this->assertEquals(getTempFolder(), getSysTempDir() . '/silverstripe-cache-var-www-silverstripe');
// Restore the SCRIPT_FILENAME variable back to the original
$_SERVER['SCRIPT_FILENAME'] = $old;
}
public function tearDown() {
parent::tearDown();
if(file_exists($this->renamedTempPath)) {
rename($this->renamedTempPath, Director::baseFolder() . '/silverstripe-cache');
}
}
}