From c0d85eb33e0eed1ab0ee5e816e0801b886b8b396 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 18 Jun 2014 11:23:54 +0000 Subject: [PATCH] Make sure to not popup the emailadminWizard if getfoldertree is called via tree interaction --- mail/inc/class.mail_ui.inc.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 3dc132affe..1ae9447ea4 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -773,7 +773,7 @@ class mail_ui list($_profileID,$_folderName) = explode(self::$delimiter,$nodeID,2); if (!empty($_folderName)) $fetchCounters = true; //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)); if (!is_null($_nodeID)) return $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 $_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 $_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, * 'item'=>array( * '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 (!is_null($_nodeID) && $_nodeID !=0) @@ -864,7 +865,10 @@ class mail_ui { error_log(__LINE__.': '.__METHOD__."() ".$e->getMessage()); $folderObjects=array(); - self::callWizard($e->getMessage(), false); + if ($_popWizard) + { + self::callWizard($e->getMessage(), false); + } $c = 1; }