extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

"egw_vfs::find() always use name as second sort criteria"

Browse Source
This commit is contained in:
Ralf Becker 2009-05-06 09:00:36 +00:00
parent 7ba0af7f28
commit 0d28eb4cea
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -447,7 +447,10 @@ class egw_vfs extends vfs_stream_wrapper
case 'mode': case 'mode':
case 'ctime': case 'ctime':
case 'mtime': case 'mtime':
uasort($result,create_function('$a,$b',$c='return '.$dirsfirst.$sort.'($a[\''.$options['order'].'\']-$b[\''.$options['order'].'\']);')); $code = $dirsfirst.$sort.'($a[\''.$options['order'].'\']-$b[\''.$options['order'].'\']);';
// always use name as second sort criteria
$code = '$cmp = '.$code.' return $cmp ? $cmp : strcasecmp($a[\'name\'],$b[\'name\']);';
uasort($result,create_function('$a,$b',$code));
break; break;
// sort alphanumerical // sort alphanumerical
@ -456,7 +459,17 @@ class egw_vfs extends vfs_stream_wrapper
// fall throught // fall throught
case 'name': case 'name':
case 'mime': case 'mime':
uasort($result,create_function('$a,$b',$c='return '.$dirsfirst.$sort.'strcasecmp($a[\''.$options['order'].'\'],$b[\''.$options['order'].'\']);')); $code = $dirsfirst.$sort.'strcasecmp($a[\''.$options['order'].'\'],$b[\''.$options['order'].'\']);';
if ($options['order'] != 'name')
{
// always use name as second sort criteria
$code = '$cmp = '.$code.' return $cmp ? $cmp : strcasecmp($a[\'name\'],$b[\'name\']);';
}
else
{
$code = 'return '.$code;
}
uasort($result,create_function('$a,$b',$code));
break; break;
} }
//echo "order='$options[order]', sort='$options[sort]' --> '$c'<br>\n"; //echo "order='$options[order]', sort='$options[sort]' --> '$c'<br>\n";