extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-15 02:19:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolved problem with some directories that cannot be opened if they contain a symlink, due to a problem with vfs_stream_wrapper::check_symlink_components, which returned that a path doesn't have a symlink in it caused by to the vfs_stream_wrapper internal symlink_cache

Browse Source
This commit is contained in:
Andreas Stöckel 2010-05-19 09:01:53 +00:00
parent ff9e241961
commit 892db7c0f2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/inc/class.vfs_stream_wrapper.inc.php
View File

@ -141,7 +141,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
* @param boolean $do_symlink=true is a direct match allowed, default yes (must be false for a lstat or readlink!) * @param boolean $do_symlink=true is a direct match allowed, default yes (must be false for a lstat or readlink!)
* @return string|boolean false if the url cant be resolved, should not happen if fstab has a root entry * @return string|boolean false if the url cant be resolved, should not happen if fstab has a root entry
*/ */
static function resolve_url($path,$do_symlink=true) static function resolve_url($path,$do_symlink=true,$use_symlinkcache=true)
{ {
static $cache = array(); static $cache = array();
@ -154,7 +154,8 @@ class vfs_stream_wrapper implements iface_stream_wrapper
return $cache[$path]; return $cache[$path];
} }
// check if we can already resolve path (or a part of it) with a known symlinks // check if we can already resolve path (or a part of it) with a known symlinks
$path = self::symlinkCache_resolve($path,$do_symlink); if ($use_symlinkcache)
$path = self::symlinkCache_resolve($path,$do_symlink);
// setting default user, passwd and domain, if it's not contained int the url // setting default user, passwd and domain, if it's not contained int the url
static $defaults; static $defaults;
@ -720,7 +721,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
{ {
if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,try_create_home=$try_create_home,check_symlink_components=$check_symlink_components)"); if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,try_create_home=$try_create_home,check_symlink_components=$check_symlink_components)");
if (!($url = self::resolve_url($path,!($flags & STREAM_URL_STAT_LINK)))) if (!($url = self::resolve_url($path,!($flags & STREAM_URL_STAT_LINK), $check_symlink_components)))
{ {
if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags) can NOT resolve path!"); if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags) can NOT resolve path!");
return false; return false;