diff --git a/mail/inc/class.mail_bo.inc.php b/mail/inc/class.mail_bo.inc.php index fda7ed35b8..3af89e19ba 100644 --- a/mail/inc/class.mail_bo.inc.php +++ b/mail/inc/class.mail_bo.inc.php @@ -1949,6 +1949,14 @@ class mail_bo { if (self::$debug) error_log(__METHOD__.__LINE__.' ServerID:'.$this->icServer->ImapServerId.", subscribedOnly:$_subscribedOnly, getCounters:$_getCounters, alwaysGetDefaultFolders:$_alwaysGetDefaultFolders, _useCacheIfPossible:$_useCacheIfPossible"); static $folders2return; + // always use static on single request if info is available; + // so if you require subscribed/unsubscribed results on a single request you MUST + // set $_useCacheIfPossible to false ! + if ($_useCacheIfPossible && isset($folders2return[$this->icServer->ImapServerId]) && !empty($folders2return[$this->icServer->ImapServerId])) + { + return $folders2return[$this->icServer->ImapServerId]; + } + if ($_subscribedOnly && $_getCounters===false) { if (is_null($folders2return)) $folders2return = egw_cache::getCache(egw_cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*1); diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index 20f756bb5f..304e3b64f1 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -1175,7 +1175,7 @@ class mail_compose } } } - //error_log(__METHOD__.__LINE__.$content['body']); + //error_log(__METHOD__.__LINE__.array2string($content)); if($content['mimeType'] == 'html') { $ishtml=1; } else { @@ -1282,6 +1282,7 @@ class mail_compose // or not work as expected, as a full featured editor that may be wanted in other apps // is way overloading the "normal" needs for composing mails $content['rtfEditorFeatures']='simple-withimage';//egw_ckeditor_config::get_ckeditor_config(); + //$content['rtfEditorFeatures']='advanced';//egw_ckeditor_config::get_ckeditor_config(); $content['validation_rules']= json_encode(mail_bo::$htmLawed_config); $etpl->setElementAttribute('mail_htmltext','mode',$content['rtfEditorFeatures']); $etpl->setElementAttribute('mail_htmltext','validation_rules',$content['validation_rules']); diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 434b8bba6b..eca2bc0f2c 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -189,12 +189,18 @@ class mail_ui $stmpl = new etemplate_new('mail.subscribe'); $profileId = $_GET['acc_id']; - $zstarttime = microtime (true); + //$zstarttime = microtime (true); $sel_options['foldertree'] = $this->getFolderTree(false, $profileId,false,false); - $zendtime = microtime(true) - $zstarttime; - error_log(__METHOD__.__LINE__. " time used: ".$zendtime); + //$zendtime = microtime(true) - $zstarttime; + //error_log(__METHOD__.__LINE__. " Building tree -> time used: ".$zendtime); + //$zstarttime = microtime (true); $unsubscribedFolders = $this->mail_bo->fetchUnSubscribedFolders(); + //$zendtime = microtime(true) - $zstarttime; + //error_log(__METHOD__.__LINE__. " Fetching Unsubscribed -> time used: ".$zendtime); + //$zstarttime = microtime (true); $allFolders = $this->mail_bo->getFolderObjects(); + //$zendtime = microtime(true) - $zstarttime; + //error_log(__METHOD__.__LINE__. " getFolderObjects -> time used: ".$zendtime); if (!is_array($content)) {