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

* Add some new filter options to show all sub-directories and files from links

Browse Source
This commit is contained in:
Nathan Gray 2014-10-28 18:54:03 +00:00
parent 0b62d3ea4a
commit cc44885bbb
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
filemanager/inc/class.filemanager_ui.inc.php
View File

@ -462,6 +462,8 @@ class filemanager_ui
'' => 'Current directory',
'2' => 'Directories sorted in',
'3' => 'Show hidden files',
'4' => 'All subdirectories',
'5' => 'Files from links',
'0' => 'Files from subdirectories',
);
@ -784,16 +786,20 @@ class filemanager_ui
// Re-map so 'No filters' favorite ('') is depth 1
$filter = $query['filter'] === '' ? 1 : $query['filter'];
$maxdepth = $filter && $filter != 4 ? (int)(boolean)$filter : null;
if($filter == 5) $maxdepth = 2;
foreach(egw_vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'],array(
'mindepth' => 1,
'maxdepth' => $filter ? (int)(boolean)$filter : null,
'maxdepth' => $maxdepth,
'dirsontop' => $filter <= 1,
'type' => $filter ? null : 'f',
'type' => $filter && $filter != 5 ? ($filter == 4 ? 'd' : null) : ($filter == 5 ? 'F':'f'),
'order' => $query['order'], 'sort' => $query['sort'],
'limit' => (int)$query['num_rows'].','.(int)$query['start'],
'need_mime' => true,
'name_preg' => $namefilter,
'hidden' => $filter == 3,
'follow' => $filter == 5,
),true) as $path => $row)
{
//echo $path; _debug_array($row);

1
filemanager/lang/egw_de.lang
View File

@ -129,6 +129,7 @@ filemanager configuration admin de Konfiguration Dateimanager
filemanager fields: filemanager de Dateimanager Felder:
filename must not be empty! filemanager de Dateinamen darf nicht leer sein!
files common de Dateien
files from links filemanager de Zeige Dateien aus verknüpften Einträgen
files from subdirectories filemanager de Dateien aus Unterverzeichnissen
files in this directory filemanager de Dateien in diesem Verzeichnis
filesystem check reported no problems. filemanager de Überprüfung des Dateisystem ergab keine Probleme.

1
filemanager/lang/egw_en.lang
View File

@ -129,6 +129,7 @@ filemanager configuration admin en File Manager configuration
filemanager fields: filemanager en Filemanager fields:
filename must not be empty! filemanager en File name must not be empty!
files common en Files
files from links filemanager en Files from links
files from subdirectories filemanager en Files from sub directories
files in this directory filemanager en Files in this directory
filesystem check reported no problems. filemanager en Filesystem check reported no problems.