holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle recursive directory creation in vfs layer, as not all underlaying

Browse Source 
wrappers, eg. smb(client), support it themselfs
This commit is contained in:
Ralf Becker 2016-08-12 08:49:06 +02:00
parent 39a28c3faa
commit d9297ca193
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/Vfs/StreamWrapper.php
View File

@ -617,8 +617,8 @@ class StreamWrapper implements StreamWrapperIface
/** /**
* This method is called in response to mkdir() calls on URL paths associated with the wrapper. * This method is called in response to mkdir() calls on URL paths associated with the wrapper.
* *
* It should attempt to create the directory specified by path. * Not all wrappers, eg. smb(client) support recursive directory creation.
* In order for the appropriate error message to be returned, do not define this method if your wrapper does not support creating directories. * Therefore we handle that here instead of passing the options to underlaying wrapper.
* *
* @param string $path * @param string $path
* @param int $mode * @param int $mode
@ -631,6 +631,17 @@ class StreamWrapper implements StreamWrapperIface
{ {
return false; return false;
} }
// check if recursive option is set and needed
if (($options & STREAM_MKDIR_RECURSIVE) &&
($parent_url = Vfs::dirname($url)) &&
!($this->url_stat($parent_url, STREAM_URL_STAT_QUIET)) &&
Vfs::parse_url($parent_url, PHP_URL_PATH) !== '/')
{
if (!mkdir($parent_url, $mode, $options)) return false;
}
// unset it now, as it was handled above
$options &= ~STREAM_MKDIR_RECURSIVE;
$ret = mkdir($url,$mode,$options); $ret = mkdir($url,$mode,$options);
// call "vfs_mkdir" hook // call "vfs_mkdir" hook