extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to cache vacation for each account to avoid to connect to IMAP server if vacation rules are not changed

Browse Source
This commit is contained in:
Hadi Nategh 2014-08-06 10:56:01 +00:00
parent 70d85ca78f
commit 4830bcf784
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/inc/class.mail_sieve.inc.php
View File

@ -620,6 +620,8 @@ class mail_sieve
{ {
self::setAsyncJob($newVacation); self::setAsyncJob($newVacation);
} }
//Reset vacationNotice cache which is used in mail_ui get_rows
egw_cache::unsetCache(egw_cache::INSTANCE,'email', 'vacationNotice'+$icServer->acc_id);
$msg = lang('Vacation notice sucessfully updated.'); $msg = lang('Vacation notice sucessfully updated.');
} }
} }

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

@ -2295,9 +2295,21 @@ class mail_ui
{ {
$sieveServer = $this->mail_bo->icServer; $sieveServer = $this->mail_bo->icServer;
try try
{
//Get vacation from cache if it's available
$vacationCached = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$sieveServer->acc_id);
if (!$vacationCached)
{ {
$sieveServer->retrieveRules(); $sieveServer->retrieveRules();
$vacation = $sieveServer->getVacation(); $vacation = $sieveServer->getVacation();
// Set vacation to the instance cache for particular account
egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$sieveServer->acc_id, $vacation);
}
else
{
return $vacationCached;
}
} catch (PEAR_Exception $ex) { } catch (PEAR_Exception $ex) {
$this->callWizard($ex->getMessage()); $this->callWizard($ex->getMessage());
} }