extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 02:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix problem regarding sorting autofolders to the beginning of the foldertree

Browse Source
This commit is contained in:
Klaus Leithoff 2016-05-10 15:17:40 +00:00
parent 4bf97ecf8c
commit 419f90f2e9
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/src/Mail.php
View File

@ -2953,11 +2953,12 @@ class Mail
$isAutoFolder=false; $isAutoFolder=false;
foreach($autoFoldersTmp as $afk=>$aF) foreach($autoFoldersTmp as $afk=>$aF)
{ {
//error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]); //error_log(__METHOD__.__LINE__.$k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/ if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter)) ($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter || //k may be child of an autofolder
stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false)) // k is parent of an autofolder
{ {
//error_log($k.'->'.$mySpecialUseFolders[$aF]); //error_log(__METHOD__.__LINE__.$k.'->'.$mySpecialUseFolders[$aF]);
$isAutoFolder=true; $isAutoFolder=true;
$autoFolderObjects[$k]=$f; $autoFolderObjects[$k]=$f;
break; break;
@ -2979,7 +2980,8 @@ class Mail
{ {
//error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]); //error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/ if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter)) ($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter|| //k may be child of an autofolder
stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false)) // k is parent of an autofolder
{ {
//error_log($k.'->'.$mySpecialUseFolders[$aF]); //error_log($k.'->'.$mySpecialUseFolders[$aF]);
$isAutoFolder=true; $isAutoFolder=true;
@ -2997,7 +2999,8 @@ class Mail
{ {
//error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]); //error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/ if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter)) ($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter|| //k may be child of an autofolder
stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false)) // k is parent of an autofolder
{ {
//error_log($k.'->'.$mySpecialUseFolders[$aF]); //error_log($k.'->'.$mySpecialUseFolders[$aF]);
$isAutoFolder=true; $isAutoFolder=true;
@ -3025,7 +3028,7 @@ class Mail
} }
} }
} }
//error_log(__METHOD__.__LINE__.array2string($autoFoldersTmp)); //error_log(__METHOD__.__LINE__.array2string($autoFolderObjects));
// avoid calling sortByAutoFolder as it is not regarding subfolders // avoid calling sortByAutoFolder as it is not regarding subfolders
$autoFolderObjectsTmp = $autoFolderObjects; $autoFolderObjectsTmp = $autoFolderObjects;
unset($autoFolderObjects); unset($autoFolderObjects);
@ -3034,7 +3037,9 @@ class Mail
{ {
foreach($autoFolderObjectsTmp as $k => $f) foreach($autoFolderObjectsTmp as $k => $f)
{ {
if($aF && ($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter)) if($aF && ($mySpecialUseFolders[$aF]==$k ||
substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter ||
stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false))
{ {
$autoFolderObjects[$k]=$f; $autoFolderObjects[$k]=$f;
} }