extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ordering of none auto folders in mail tree

Browse Source
This commit is contained in:
Hadi Nategh 2015-09-29 13:43:40 +00:00
parent 1a4705ca5c
commit 83d34d2a2f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -2722,6 +2722,10 @@ class emailadmin_imapbase
}
if (is_array($aFolders)) uasort ($aFolders, array($this,'sortByAutofolder'));
ksort($aFolders);
// Sort none auto folders base on mailbox name
uasort($nFolders,array($this,'sortByMailbox'));
$subFolders = array_merge($aFolders,$nFolders);
}
else
@ -2822,23 +2826,20 @@ class emailadmin_imapbase
}
/**
* sortByName
* sortByMailbox
*
* Helper function to sort folders array by name
* Helper function to sort folders array by mailbox
* @param array $a
* @param array $b array of folders
* @return int expect values (0, 1 or -1)
*/
function sortByName($a,$b)
function sortByMailbox($a,$b)
{
$a = mail_tree::pathToFolderData($a['MAILBOX'], $a['delimiter']);
$b = mail_tree::pathToFolderData($b['MAILBOX'], $b['delimiter']);
// 0, 1 und -1
return strcasecmp($a['name'],$b['name']);
return strcasecmp($a['MAILBOX'],$b['MAILBOX']);
}
/**
* sortByAutoFolderPos
* sortByAutoFolder
*
* Helper function to sort folder-objects by auto Folder Position
* @param array $a