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

"fixed not shown comments and other properties, if path contained a symlink"

Browse Source
This commit is contained in:
Ralf Becker 2009-03-27 19:03:29 +00:00
parent 9e8ef4d851
commit 881225849d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -443,7 +443,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
{
return false;
}
$scheme2urls[(string)parse_url($url,PHP_URL_SCHEME)][] = $url;
$scheme2urls[(string)parse_url($url,PHP_URL_SCHEME)][$path] = $url;
}
$ret = array();
foreach($scheme2urls as $scheme => $urls)
@ -466,7 +466,14 @@ class vfs_stream_wrapper implements iface_stream_wrapper
{
return $r;
}
$ret += $r;
// we need to re-translate the urls to pathes, as they can eg. contain symlinks
foreach($urls as $path => $url)
{
if (isset($r[$url]) || isset($r[$url=parse_url($url,PHP_URL_PATH)]))
{
$ret[$path] = $r[$url];
}
}
}
// call the filesystem specific function (dont allow to use arrays!)
elseif(!function_exists($name) || is_array($pathes))
@ -726,7 +733,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
}
if (!$stat && $check_symlink_components) // check if there's a symlink somewhere inbetween the path
{
$stat = self::check_symlink_components($path,$flags,$urlx=$url);
$stat = self::check_symlink_components($path,$flags,$url);
}
elseif(is_array($stat) && !isset($stat['url']))
{