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

handle folder-tree refresh on subscribe/unsubscribe ; with focus on shared folders

Browse Source
This commit is contained in:
Klaus Leithoff 2014-05-20 14:28:23 +00:00
parent c34ddd14c4
commit 86eb361233
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mail/inc/class.mail_ui.inc.php
View File

@ -276,6 +276,7 @@ class mail_ui
} }
return $result; return $result;
} }
/** /**
* Subscription popup window * Subscription popup window
* *
@ -345,6 +346,7 @@ class mail_ui
} }
} }
$parentFolder='INBOX'; $parentFolder='INBOX';
/*
$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false); $folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false);
if ($folderInfo['unseen']) if ($folderInfo['unseen'])
{ {
@ -354,8 +356,10 @@ class mail_ui
{ {
$folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName']; $folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName'];
} }
*/
$refreshData = array( $refreshData = array(
$content['profileId'].self::$delimiter.$parentFolder=>$folderInfo['shortDisplayName']); $content['profileId']/*.self::$delimiter.$parentFolder*/=>lang($parentFolder)//$folderInfo['shortDisplayName'])
);
// Send full info back in the response // Send full info back in the response
$response = egw_json_response::get(); $response = egw_json_response::get();
@ -3752,20 +3756,28 @@ $this->partID = $partID;
// that we get what we request // that we get what we request
if ($_subscribedOnly != $oldPrefForSubscribedOnly) $this->mail_bo->resetFolderObjectCache($profileID); if ($_subscribedOnly != $oldPrefForSubscribedOnly) $this->mail_bo->resetFolderObjectCache($profileID);
if ($profileID != $this->mail_bo->profileID) return; // only current connection if ($profileID != $this->mail_bo->profileID) return; // only current connection
$parentFolder=(!empty($folderName)?$folderName:'INBOX'); if (!empty($folderName))
$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false);
if ($folderInfo['unseen'])
{ {
$folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName'].' ('.$folderInfo['unseen'].')'; $parentFolder=(!empty($folderName)?$folderName:'INBOX');
$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false);
if ($folderInfo['unseen'])
{
$folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName'].' ('.$folderInfo['unseen'].')';
}
if ($folderInfo['unseen']==0 && $folderInfo['shortDisplayName'])
{
$folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName'];
}
$refreshData = array(
$profileID.self::$delimiter.$parentFolder=>$folderInfo['shortDisplayName']);
} }
if ($folderInfo['unseen']==0 && $folderInfo['shortDisplayName']) else
{ {
$folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName']; $refreshData = array(
$profileID=>lang('INBOX')//string with no meaning lateron
);
} }
$refreshData = array(
$profileID.self::$delimiter.$parentFolder=>$folderInfo['shortDisplayName']);
// Send full info back in the response // Send full info back in the response
$response = egw_json_response::get(); $response = egw_json_response::get();
foreach($refreshData as $folder => &$name) foreach($refreshData as $folder => &$name)