From 3e36baa6d8ce99713e9cae0adfe5f8574ceb0ab9 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 25 Oct 2007 23:07:24 +0000
Subject: [PATCH] FEATURE Using consistent umask static
 Filesystem::$folder_create_mask for mkdir()-calls

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43870 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/i18n.php             | 8 ++++----
 core/model/Image.php      | 4 ++--
 filesystem/File.php       | 4 ++--
 filesystem/Filesystem.php | 7 ++++++-
 filesystem/Folder.php     | 2 +-
 filesystem/GD.php         | 2 +-
 filesystem/PostBackup.php | 2 +-
 7 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/core/i18n.php b/core/i18n.php
index 7d171c0f9..08f698cfd 100755
--- a/core/i18n.php
+++ b/core/i18n.php
@@ -348,8 +348,8 @@ class i18n extends Controller {
 		'my_MM' => 'Burmese (Myanmar)',
 		'myv_RU' => 'Erzya (Russia)',
 		'na_NR' => 'Nauru (Nauru)',
-		'nb_NO' => 'Norwegian Bokmål (Norway)',
-		'nb_SJ' => 'Norwegian Bokmål (Svalbard and Jan Mayen)',
+		'nb_NO' => 'Norwegian Bokm�l (Norway)',
+		'nb_SJ' => 'Norwegian Bokm�l (Svalbard and Jan Mayen)',
 		'nd_ZW' => 'North Ndebele (Zimbabwe)',
 		'ndc_MZ' => 'Ndau (Mozambique)',
 		'ne_NP' => 'Nepali (Nepal)',
@@ -391,7 +391,7 @@ class i18n extends Controller {
 		'pt_TL' => 'Portuguese (East Timor)',
 		'qu_BO' => 'Quechua (Bolivia)',
 		'qu_PE' => 'Quechua (Peru)',
-		'rcf_RE' => 'Réunion Creole French (Reunion)',
+		'rcf_RE' => 'R�union Creole French (Reunion)',
 		'rej_ID' => 'Rejang (Indonesia)',
 		'rif_MA' => 'Tarifit (Morocco)',
 		'rjb_IN' => 'Rajbanshi (India)',
@@ -1024,7 +1024,7 @@ class i18n extends Controller {
 				// Create folder for lang files
 				$langFolder = $baseDir . '/' . $module . '/lang';
 				if(!file_exists($baseDir. '/' . $module . '/lang')) {
-					mkdir($langFolder, 02775);
+					mkdir($langFolder, Filesystem::$folder_create_mask);
 					touch($baseDir. '/' . $module . '/lang/_manifest_exclude');
 				}
 				
diff --git a/core/model/Image.php b/core/model/Image.php
index 3bb18cb5e..7d70fa3d0 100755
--- a/core/model/Image.php
+++ b/core/model/Image.php
@@ -130,11 +130,11 @@ class Image extends File {
 
 		// Create a folder		
 		if(!file_exists("$base/assets")) {
-			mkdir("$base/assets", 02775);
+			mkdir("$base/assets", Filesystem::$folder_create_mask);
 		}
 		
 		if(!file_exists("$base/assets/$class")) {
-			mkdir("$base/assets/$class", 02775);
+			mkdir("$base/assets/$class", Filesystem::$folder_create_mask);
 		}
 
 		// Generate default filename
diff --git a/filesystem/File.php b/filesystem/File.php
index f7e485358..cc6639723 100755
--- a/filesystem/File.php
+++ b/filesystem/File.php
@@ -161,10 +161,10 @@ class File extends DataObject {
 
 		// Create a folder for uploading.
 		if(!file_exists("$base/assets")){
-			mkdir("$base/assets", 02775);
+			mkdir("$base/assets", Filesystem::$folder_create_mask);
 		}
 		if(!file_exists("$base/assets/Uploads")){
-			mkdir("$base/assets/Uploads", 02775);
+			mkdir("$base/assets/Uploads", Filesystem::$folder_create_mask);
 		}
 
 		// Generate default filename
diff --git a/filesystem/Filesystem.php b/filesystem/Filesystem.php
index 70f9c8540..8af1f42e8 100755
--- a/filesystem/Filesystem.php
+++ b/filesystem/Filesystem.php
@@ -1,12 +1,17 @@
 <?php
 
 class Filesystem extends Object {
+	
+	public static $file_create_mask = 02775;
+	
+	public static $folder_create_mask = 02775;
+	
 	/**
 	 * Create a folder, recursively
 	 */
 	static function makeFolder($folder) {
 		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);
 	}
 	
 	/**
diff --git a/filesystem/Folder.php b/filesystem/Folder.php
index f8a09f264..305f0bedc 100755
--- a/filesystem/Folder.php
+++ b/filesystem/Folder.php
@@ -21,7 +21,7 @@ class Folder extends File {
 				$item->ParentID = $parentID;
 				$item->Name = $part;
 				$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;
 		}
diff --git a/filesystem/GD.php b/filesystem/GD.php
index 57bc3526f..3ecdbf72d 100755
--- a/filesystem/GD.php
+++ b/filesystem/GD.php
@@ -357,7 +357,7 @@ class GD extends Object {
 	
 	function makeDir($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) {
diff --git a/filesystem/PostBackup.php b/filesystem/PostBackup.php
index 11e981aca..d3e13fc31 100644
--- a/filesystem/PostBackup.php
+++ b/filesystem/PostBackup.php
@@ -12,7 +12,7 @@ class PostBackup extends Object {
 		
 		// Append to the file
 		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');