extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:18:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

* sorting fileselection popup always by directory on top and then name

Browse Source
This commit is contained in:
Ralf Becker 2010-11-09 12:59:27 +00:00
parent 27abf5f015
commit 65813764ed
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
filemanager/inc/class.filemanager_select.inc.php
View File

@ -134,12 +134,12 @@ class filemanager_select
// encode chars which special meaning in url/vfs (some like / get removed!) // encode chars which special meaning in url/vfs (some like / get removed!)
$content['name'] = egw_vfs::encodePathComponent($content['file_upload']['name']); $content['name'] = egw_vfs::encodePathComponent($content['file_upload']['name']);
$to_path = egw_vfs::concat($content['path'],$content['name']); $to_path = egw_vfs::concat($content['path'],$content['name']);
$copy_result = (egw_vfs::is_writable($content['path']) || egw_vfs::is_writable($to)) && $copy_result = (egw_vfs::is_writable($content['path']) || egw_vfs::is_writable($to)) &&
copy($content['file_upload']['tmp_name'],egw_vfs::PREFIX.$to_path); copy($content['file_upload']['tmp_name'],egw_vfs::PREFIX.$to_path);
} }
//Break on an error condition //Break on an error condition
if ((($content['mode'] == 'open' || $content['mode'] == 'saveas') && ($content['name'] == '')) || ($copy_result === false)) if ((($content['mode'] == 'open' || $content['mode'] == 'saveas') && ($content['name'] == '')) || ($copy_result === false))
{ {
if ($copy_result === false) if ($copy_result === false)
@ -220,7 +220,11 @@ class filemanager_select
{ {
$content['path'] = filemanager_ui::get_home_dir(); $content['path'] = filemanager_ui::get_home_dir();
} }
if (!($d = egw_vfs::opendir($content['path']))) if (!($files = egw_vfs::find($content['path'],array(
'order' => 'name',
'sort' => 'ASC',
'maxdepth' => 1,
))))
{ {
$content['msg'] = lang("Can't open directory %1!",$content['path']); $content['msg'] = lang("Can't open directory %1!",$content['path']);
} }
@ -228,10 +232,10 @@ class filemanager_select
{ {
$n = 0; $n = 0;
$content['dir'] = array('mode' => $content['mode']); $content['dir'] = array('mode' => $content['mode']);
while (($name = readdir($d))) array_shift($files); // remove directory itself
foreach($files as $path)
{ {
if ($name[0] == '.' || $name == 'Thumbs.db') continue; // ignore hidden files $name = egw_vfs::basename($path);
$path = egw_vfs::concat($content['path'],$name);
$is_dir = egw_vfs::is_dir($path); $is_dir = egw_vfs::is_dir($path);
if ($content['mime'] && !$is_dir && egw_vfs::mime_content_type($path) != $content['mime']) if ($content['mime'] && !$is_dir && egw_vfs::mime_content_type($path) != $content['mime'])
{ {
@ -251,7 +255,6 @@ class filemanager_select
++$n; ++$n;
} }
if (!$n) $readonlys['selected[]'] = true; // remove checkbox from empty line if (!$n) $readonlys['selected[]'] = true; // remove checkbox from empty line
closedir($d);
} }
$content['js'] = '<script type="text/javascript"> $content['js'] = '<script type="text/javascript">