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

Make sure to not popup the emailadminWizard if getfoldertree is called via tree interaction

Browse Source
This commit is contained in:
Hadi Nategh 2014-06-18 11:23:54 +00:00
parent 94950729ab
commit c0d85eb33e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -773,7 +773,7 @@ class mail_ui
list($_profileID,$_folderName) = explode(self::$delimiter,$nodeID,2); list($_profileID,$_folderName) = explode(self::$delimiter,$nodeID,2);
if (!empty($_folderName)) $fetchCounters = true; if (!empty($_folderName)) $fetchCounters = true;
//error_log(__METHOD__.__LINE__.':'.$nodeID.'->'.array2string($fetchCounters)); //error_log(__METHOD__.__LINE__.':'.$nodeID.'->'.array2string($fetchCounters));
$data = $this->getFolderTree($fetchCounters, $nodeID, $subscribedOnly); $data = $this->getFolderTree($fetchCounters, $nodeID, $subscribedOnly,true,true,false);
//error_log(__METHOD__.__LINE__.':'.$nodeID.'->'.array2string($data)); //error_log(__METHOD__.__LINE__.':'.$nodeID.'->'.array2string($data));
if (!is_null($_nodeID)) return $data; if (!is_null($_nodeID)) return $data;
etemplate_widget_tree::send_quote_json($data); etemplate_widget_tree::send_quote_json($data);
@ -787,6 +787,7 @@ class mail_ui
* @param boolean $_subscribedOnly flag to tell wether to fetch all or only subscribed (default) * @param boolean $_subscribedOnly flag to tell wether to fetch all or only subscribed (default)
* @param boolean $_returnNodeOnly only effective if $_nodeID is set, and $_nodeID is_nummeric * @param boolean $_returnNodeOnly only effective if $_nodeID is set, and $_nodeID is_nummeric
* @param boolean _useCacheIfPossible - if set to false cache will be ignored and reinitialized * @param boolean _useCacheIfPossible - if set to false cache will be ignored and reinitialized
* @param boolean $_popWizard Check if getFoldertree is called via open account (TRUE) or via tree interaction (FALSE), to control wizard popup
* @return array something like that: array('id'=>0, * @return array something like that: array('id'=>0,
* 'item'=>array( * 'item'=>array(
* 'text'=>'INBOX', * 'text'=>'INBOX',
@ -796,7 +797,7 @@ class mail_ui
* ) * )
* ); * );
*/ */
function getFolderTree($_fetchCounters=false, $_nodeID=null, $_subscribedOnly=true, $_returnNodeOnly=true, $_useCacheIfPossible=true) function getFolderTree($_fetchCounters=false, $_nodeID=null, $_subscribedOnly=true, $_returnNodeOnly=true, $_useCacheIfPossible=true, $_popWizard=true)
{ {
if (mail_bo::$debugTimes) $starttime = microtime (true); if (mail_bo::$debugTimes) $starttime = microtime (true);
if (!is_null($_nodeID) && $_nodeID !=0) if (!is_null($_nodeID) && $_nodeID !=0)
@ -864,7 +865,10 @@ class mail_ui
{ {
error_log(__LINE__.': '.__METHOD__."() ".$e->getMessage()); error_log(__LINE__.': '.__METHOD__."() ".$e->getMessage());
$folderObjects=array(); $folderObjects=array();
self::callWizard($e->getMessage(), false); if ($_popWizard)
{
self::callWizard($e->getMessage(), false);
}
$c = 1; $c = 1;
} }