adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding umask back to Folder class, see #27 for some amusement

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7619 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-09-17 21:54:36 +00:00
parent f65de0b28d
commit fd73cf738a
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cake/libs/folder.php
View file

@ -60,7 +60,7 @@ class Folder extends Object {
* @var boolean
* @access public
*/
var $mode = '0755';
var $mode = 0755;
/**
* holds messages from last method.
*
@ -102,7 +102,7 @@ class Folder extends Object {
$path = TMP;
}
if ($mode) {
$this->mode = intval($mode, 8);
$this->mode = $mode;
}
if (!file_exists($path) && $create == true) {
@ -472,10 +472,13 @@ class Folder extends Object {
if ($this->create($nextPathname, $mode)) {
if (!file_exists($pathname)) {
if (mkdir($pathname, intval($mode, 8))) {
$old = umask(0);
if (mkdir($pathname, $mode)) {
umask($old);
$this->__messages[] = sprintf(__('%s created', true), $pathname);
return true;
} else {
umask($old);
$this->__errors[] = sprintf(__('%s NOT created', true), $pathname);
return false;
}
@ -614,8 +617,12 @@ class Folder extends Object {
}
if (is_dir($from) && !file_exists($to)) {
if (mkdir($to, intval($mode, 8))) {
chmod($to, intval($mode, 8));
$old = umask(0);
if (mkdir($to, $mode)) {
umask($old);
$old = umask(0);
chmod($to, $mode);
umask($old);
$this->__messages[] = sprintf(__('%s created', true), $to);
$options = array_merge($options, array('to'=> $to, 'from'=> $from));
$this->copy($options);