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

MINOR Fixed spaces with tabs for Core::getTempFolder()

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@113923 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2010-11-18 21:35:11 +00:00 committed by Sam Minnee
parent a9e611d721
commit b7d7a86b51
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
core/Core.php
View File

@ -288,39 +288,41 @@ function getSysTempDir() {
*/ */
function getTempFolder($base = null) { function getTempFolder($base = null) {
if(!$base) $base = BASE_PATH; if(!$base) $base = BASE_PATH;
if($base) { if($base) {
$cachefolder = "silverstripe-cache" . str_replace(array(' ', "/", ":", "\\"), "-", $base); $cachefolder = "silverstripe-cache" . str_replace(array(' ', "/", ":", "\\"), "-", $base);
} else { } else {
$cachefolder = "silverstripe-cache"; $cachefolder = "silverstripe-cache";
} }
$ssTmp = BASE_PATH . "/silverstripe-cache";
if(@file_exists($ssTmp)) {
return $ssTmp;
}
$sysTmp = getSysTempDir();
$worked = true; $ssTmp = BASE_PATH . "/silverstripe-cache";
$ssTmp = "$sysTmp/$cachefolder"; if(@file_exists($ssTmp)) {
if(!@file_exists($ssTmp)) { return $ssTmp;
@$worked = mkdir($ssTmp); }
}
if(!$worked) { $sysTmp = getSysTempDir();
$ssTmp = BASE_PATH . "/silverstripe-cache"; $worked = true;
$worked = true; $ssTmp = "$sysTmp/$cachefolder";
if(!@file_exists($ssTmp)) {
@$worked = mkdir($ssTmp); if(!@file_exists($ssTmp)) {
} @$worked = mkdir($ssTmp);
} }
if(!$worked) {
user_error("Permission problem gaining access to a temp folder. " . if(!$worked) {
"Please create a folder named silverstripe-cache in the base folder " . $ssTmp = BASE_PATH . "/silverstripe-cache";
"of the installation and ensure it has the correct permissions", E_USER_ERROR); $worked = true;
} if(!@file_exists($ssTmp)) {
@$worked = mkdir($ssTmp);
return $ssTmp; }
}
if(!$worked) {
user_error("Permission problem gaining access to a temp folder. " .
"Please create a folder named silverstripe-cache in the base folder " .
"of the installation and ensure it has the correct permissions", E_USER_ERROR);
}
return $ssTmp;
} }
/** /**