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

new type F for egw_vfs::find to return only files or symlinks to files

Browse Source 
--> dont show symlinks to dirs as attachements / link-widget
This commit is contained in:
Ralf Becker 2009-05-04 16:37:10 +00:00
parent 24bbec6df1
commit bc65324a7c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.egw_link.inc.php
View File

@ -904,7 +904,7 @@ class egw_link extends solink
if (!($extra = self::get_registry($app,'find_extra'))) $extra = array();
$attached = array();
if (($url2stats = egw_vfs::find($path,array('need_mime'=>true,'type'=>'f')+$extra,true)))
if (($url2stats = egw_vfs::find($path,array('need_mime'=>true,'type'=>'F')+$extra,true)))
{
$props = egw_vfs::propfind(array_keys($url2stats)); // get the comments
foreach($url2stats as $url => &$fileinfo)

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

@ -311,7 +311,7 @@ class egw_vfs extends vfs_stream_wrapper
*
* @param string/array $base base of the search
* @param array $options=null the following keys are allowed:
* - type => {d|f} d=dirs, f=files, default both
* - type => {d|f|F} d=dirs, f=files (incl. symlinks), F=files (incl. symlinks to files), 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
@ -337,7 +337,7 @@ class egw_vfs extends vfs_stream_wrapper
{
//error_log(__METHOD__."(".print_r($base,true).",".print_r($options,true).",".print_r($exec,true).",".print_r($exec_params,true).")\n");
$type = $options['type']; // 'd' or 'f'
$type = $options['type']; // 'd', 'f' or 'F'
$dirs_last = $options['depth']; // put content of dirs before the dir itself
// show dirs on top by default, if no recursive listing (allways disabled if $type specified, as unnecessary)
$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth'])&&$options['maxdepth']>0);
@ -514,7 +514,8 @@ class egw_vfs extends vfs_stream_wrapper
{
return; // not found, should not happen
}
if ($type && ($type == 'd') == !($stat['mode'] & sqlfs_stream_wrapper::MODE_DIR)) // != is_dir() which can be true for symlinks
if ($type && (($type == 'd') == !($stat['mode'] & sqlfs_stream_wrapper::MODE_DIR) || // != is_dir() which can be true for symlinks
$type == 'F' && is_dir($path))) // symlink to a directory
{
return; // wrong type
}