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

Exclude symlinks from Vfs

Browse Source
This commit is contained in:
nathangray
2018-04-09 13:56:37 -06:00
parent abc1ccc8f1
commit f26b271067
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Vfs.php
View File

@@ -384,7 +384,7 @@ class Vfs
*
* @param string|array $base base of the search
* @param array $options =null the following keys are allowed:
* - type => {d|f|F} d=dirs, f=files (incl. symlinks), F=files (incl. symlinks to files), default all
* - type => {d|f|F|!l} d=dirs, f=files (incl. symlinks), F=files (incl. symlinks to files), !l=no symlinks, default all
* - depth => {true|false(default)} put the contents of a dir before the dir itself
* - dirsontop => {true(default)|false} allways return dirs before the files (two distinct blocks)
* - mindepth,maxdepth minimal or maximal depth to be returned
@@ -646,7 +646,8 @@ class Vfs
return; // not found, should not happen
}
if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) || // != is_dir() which can be true for symlinks
$type == 'F' && is_dir($path))) // symlink to a directory
$type == 'F' && is_dir($path)) || // symlink to a directory
$type == '!l' && ($stat['mode'] & Vfs::MODE_LINK)) // Symlink
{
return; // wrong type
}

12
api/src/Vfs/Sharing.php
View File

@@ -443,7 +443,7 @@ class Sharing
}
// We don't allow sharing links, share target instead
if($target = Vfs::readlink($path))
if(($target = Vfs::readlink($path)))
{
$path = $target;
}
@@ -761,5 +761,15 @@ if (file_exists(__DIR__.'/../../../filemanager/inc/class.filemanager_ui.inc.php'
);
return $actions;
}
protected function get_vfs_options($query)
{
$options = parent::get_vfs_options($query);
// Hide symlinks
$options['type'] = '!l';
return $options;
}
}
}