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

FEATURE Using consistent umask static Filesystem::$folder_create_mask for mkdir()-calls

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43870 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-10-25 23:07:24 +00:00
parent 3aade3643d
commit 3e36baa6d8
7 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/i18n.php
View File

@ -348,8 +348,8 @@ class i18n extends Controller {
'my_MM' => 'Burmese (Myanmar)', 'my_MM' => 'Burmese (Myanmar)',
'myv_RU' => 'Erzya (Russia)', 'myv_RU' => 'Erzya (Russia)',
'na_NR' => 'Nauru (Nauru)', 'na_NR' => 'Nauru (Nauru)',
'nb_NO' => 'Norwegian Bokmål (Norway)', 'nb_NO' => 'Norwegian Bokm<EFBFBD>l (Norway)',
'nb_SJ' => 'Norwegian Bokmål (Svalbard and Jan Mayen)', 'nb_SJ' => 'Norwegian Bokm<EFBFBD>l (Svalbard and Jan Mayen)',
'nd_ZW' => 'North Ndebele (Zimbabwe)', 'nd_ZW' => 'North Ndebele (Zimbabwe)',
'ndc_MZ' => 'Ndau (Mozambique)', 'ndc_MZ' => 'Ndau (Mozambique)',
'ne_NP' => 'Nepali (Nepal)', 'ne_NP' => 'Nepali (Nepal)',
@ -391,7 +391,7 @@ class i18n extends Controller {
'pt_TL' => 'Portuguese (East Timor)', 'pt_TL' => 'Portuguese (East Timor)',
'qu_BO' => 'Quechua (Bolivia)', 'qu_BO' => 'Quechua (Bolivia)',
'qu_PE' => 'Quechua (Peru)', 'qu_PE' => 'Quechua (Peru)',
'rcf_RE' => 'Réunion Creole French (Reunion)', 'rcf_RE' => 'R<EFBFBD>union Creole French (Reunion)',
'rej_ID' => 'Rejang (Indonesia)', 'rej_ID' => 'Rejang (Indonesia)',
'rif_MA' => 'Tarifit (Morocco)', 'rif_MA' => 'Tarifit (Morocco)',
'rjb_IN' => 'Rajbanshi (India)', 'rjb_IN' => 'Rajbanshi (India)',
@ -1024,7 +1024,7 @@ class i18n extends Controller {
// Create folder for lang files // Create folder for lang files
$langFolder = $baseDir . '/' . $module . '/lang'; $langFolder = $baseDir . '/' . $module . '/lang';
if(!file_exists($baseDir. '/' . $module . '/lang')) { if(!file_exists($baseDir. '/' . $module . '/lang')) {
mkdir($langFolder, 02775); mkdir($langFolder, Filesystem::$folder_create_mask);
touch($baseDir. '/' . $module . '/lang/_manifest_exclude'); touch($baseDir. '/' . $module . '/lang/_manifest_exclude');
} }

4
core/model/Image.php
View File

@ -130,11 +130,11 @@ class Image extends File {
// Create a folder // Create a folder
if(!file_exists("$base/assets")) { if(!file_exists("$base/assets")) {
mkdir("$base/assets", 02775); mkdir("$base/assets", Filesystem::$folder_create_mask);
} }
if(!file_exists("$base/assets/$class")) { if(!file_exists("$base/assets/$class")) {
mkdir("$base/assets/$class", 02775); mkdir("$base/assets/$class", Filesystem::$folder_create_mask);
} }
// Generate default filename // Generate default filename

4
filesystem/File.php
View File

@ -161,10 +161,10 @@ class File extends DataObject {
// Create a folder for uploading. // Create a folder for uploading.
if(!file_exists("$base/assets")){ if(!file_exists("$base/assets")){
mkdir("$base/assets", 02775); mkdir("$base/assets", Filesystem::$folder_create_mask);
} }
if(!file_exists("$base/assets/Uploads")){ if(!file_exists("$base/assets/Uploads")){
mkdir("$base/assets/Uploads", 02775); mkdir("$base/assets/Uploads", Filesystem::$folder_create_mask);
} }
// Generate default filename // Generate default filename

7
filesystem/Filesystem.php
View File

@ -1,12 +1,17 @@
<?php <?php
class Filesystem extends Object { class Filesystem extends Object {
public static $file_create_mask = 02775;
public static $folder_create_mask = 02775;
/** /**
* Create a folder, recursively * Create a folder, recursively
*/ */
static function makeFolder($folder) { static function makeFolder($folder) {
if(!file_exists($base = dirname($folder))) self::makeFolder($base); if(!file_exists($base = dirname($folder))) self::makeFolder($base);
if(!file_exists($folder)) mkdir($folder, 02775); if(!file_exists($folder)) mkdir($folder, Filesystem::$folder_create_mask);
} }
/** /**

2
filesystem/Folder.php
View File

@ -21,7 +21,7 @@ class Folder extends File {
$item->ParentID = $parentID; $item->ParentID = $parentID;
$item->Name = $part; $item->Name = $part;
$item->write(); $item->write();
if(!file_exists($item->getFullPath())) mkdir($item->getFullPath(),02775); if(!file_exists($item->getFullPath())) mkdir($item->getFullPath(),Filesystem::$folder_create_mask);
} }
$parentID = $item->ID; $parentID = $item->ID;
} }

2
filesystem/GD.php
View File

@ -357,7 +357,7 @@ class GD extends Object {
function makeDir($dirname) { function makeDir($dirname) {
if(!file_exists(dirname($dirname))) $this->makeDir(dirname($dirname)); if(!file_exists(dirname($dirname))) $this->makeDir(dirname($dirname));
if(!file_exists($dirname)) mkdir($dirname, 02775); if(!file_exists($dirname)) mkdir($dirname, Filesystem::$folder_create_mask);
} }
function writeTo($filename) { function writeTo($filename) {

2
filesystem/PostBackup.php
View File

@ -12,7 +12,7 @@ class PostBackup extends Object {
// Append to the file // Append to the file
if(!file_exists(BACKUP_DIR)) if(!file_exists(BACKUP_DIR))
mkdir(BACKUP_DIR, 0775, true); mkdir(BACKUP_DIR, Filesystem::$folder_create_mask, true);
$backupFile = fopen(BACKUP_DIR . '/' . $form->class, 'a'); $backupFile = fopen(BACKUP_DIR . '/' . $form->class, 'a');