Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-04 07:14:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ CFileHelperTest

Browse Source 
* newDirMode correctly setted on recursive creation of dst dir.
This commit is contained in:
Konstantin G Romanov
2012-10-12 14:03:52 +04:00
parent 0aeef5e973
commit b892a0bab6
2 changed files with 99 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
framework/utils/CFileHelper.php
View File

@@ -57,7 +57,7 @@ class CFileHelper
$level=-1;
extract($options);
if(!is_dir($dst))
self::mkdir($dst, self::getModeFromOptions($options), true);
self::mkdir($dst, $options, true);
self::copyDirectoryRecursive($src,$dst,'',$fileTypes,$exclude,$level,$options);
}
@@ -114,7 +114,7 @@ class CFileHelper
protected static function copyDirectoryRecursive($src,$dst,$base,$fileTypes,$exclude,$level,$options)
{
if(!is_dir($dst))
self::mkdir($dst, self::getModeFromOptions($options), false);
self::mkdir($dst, $options, false);
$folder=opendir($src);
while(($file=readdir($folder))!==false)
@@ -260,32 +260,25 @@ class CFileHelper
}
/**
* Creates directory for $dst path with $mode and $recursive creation is allowed.
* For concurrent compatibility chmod is used instead of mkdir's $mode.
* Shared environment safe version of mkdir. Supports recursive creation.
* For avoidance of umask side-effects chmod is used.
*
* @static
* @param string $dst path to be created
* @param integer $mode access bitmask
* @param array $options newDirMode element used, must contain access bitmask.
* @param boolean $recursive
* @return boolean result of mkdir
* @see mkdir
*/
private static function mkdir($dst, $mode, $recursive)
private static function mkdir($dst, array $options, $recursive)
{
$res = mkdir($dst, $mode, $recursive);
$prevDir = dirname($dst);
if ($recursive && !is_dir($dst) && !is_dir($prevDir)) self::mkdir(dirname($dst), $options, true);
$mode = isset($options['newDirMode']) ? $options['newDirMode'] : 0777;
$res = mkdir($dst, $mode);
chmod($dst, $mode);
return $res;
}
/**
* Returns dir access mode from options, if set, or default value (0777).
* @static
* @param array $options
* @return integer
*/
private static function getModeFromOptions(array $options)
{
return isset($options['newDirMode']) ? $options['newDirMode'] : 0777;
}
}