Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev/kolab3' of ssh://git.kolabsys.com/git/roundcube into dev/kolab3

Browse source
This commit is contained in:
Thomas Bruederli 2012-05-15 19:08:16 +02:00
commit dadf00f1a6
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/libkolab/lib/kolab_storage_cache.php
View file

@ -82,7 +82,8 @@ class kolab_storage_cache
return; return;
// lock synchronization for this folder or wait if locked // lock synchronization for this folder or wait if locked
$this->_sync_lock(); if (!$this->_sync_lock())
return;
// synchronize IMAP mailbox cache // synchronize IMAP mailbox cache
$this->imap->folder_sync($this->folder->name); $this->imap->folder_sync($this->folder->name);
@ -305,7 +306,7 @@ class kolab_storage_cache
$filter = $this->_query2assoc($query); $filter = $this->_query2assoc($query);
// use 'list' for folder's default objects // use 'list' for folder's default objects
if ($filter['type'] == $this->type) { if ($filter['type'] == $this->type && !empty($this->index)) {
$index = $this->index; $index = $this->index;
} }
else { // search by object type else { // search by object type
@ -488,7 +489,7 @@ class kolab_storage_cache
private function _sync_lock() private function _sync_lock()
{ {
if (!$this->ready) if (!$this->ready)
return; return false;
$sql_arr = $this->db->fetch_assoc($this->db->query( $sql_arr = $this->db->fetch_assoc($this->db->query(
"SELECT msguid AS locked FROM kolab_cache ". "SELECT msguid AS locked FROM kolab_cache ".
@ -522,6 +523,8 @@ class kolab_storage_cache
'lock' 'lock'
); );
} }
return true;
} }
/** /**