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

Avoid fatal errors if folder type information is missing (#1321)

Browse source
This commit is contained in:
Thomas Bruederli 2014-01-06 17:08:02 +01:00
parent b1e824becf
commit 229d31e90e
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ class kolab_storage_cache
protected $folder; protected $folder;
protected $uid2msg; protected $uid2msg;
protected $objects; protected $objects;
protected $index = array(); protected $index = null;
protected $metadata = array(); protected $metadata = array();
protected $folder_id; protected $folder_id;
protected $resource_uri; protected $resource_uri;
@ -58,8 +58,10 @@ class kolab_storage_cache
rcube::raise_error(array( rcube::raise_error(array(
'code' => 900, 'code' => 900,
'type' => 'php', 'type' => 'php',
'message' => "No kolab_storage_cache class found for folder of type " . $storage_folder->type 'message' => "No kolab_storage_cache class found for folder '$storage_folder->name' of type '$storage_folder->type'"
), true); ), true);
return new kolab_storage_cache($storage_folder);
} }
} }
@ -104,7 +106,7 @@ class kolab_storage_cache
$this->resource_uri = $this->folder->get_resource_uri(); $this->resource_uri = $this->folder->get_resource_uri();
$this->folders_table = $this->db->table_name('kolab_folders'); $this->folders_table = $this->db->table_name('kolab_folders');
$this->cache_table = $this->db->table_name('kolab_cache_' . $this->folder->type); $this->cache_table = $this->db->table_name('kolab_cache_' . $this->folder->type);
$this->ready = $this->enabled; $this->ready = $this->enabled && !empty($this->folder->type);
$this->folder_id = null; $this->folder_id = null;
} }
@ -446,7 +448,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 (is_array($this->index) && $filter['type'] == $this->type) {
$index = $this->index; $index = $this->index;
} }
else { // search by object type else { // search by object type
@ -454,10 +456,6 @@ class kolab_storage_cache
$index = $this->imap->search_once($this->folder->name, $search)->get(); $index = $this->imap->search_once($this->folder->name, $search)->get();
} }
if ($index->is_error()) {
return null;
}
// fetch all messages in $index from IMAP // fetch all messages in $index from IMAP
$result = $uids ? $this->_fetch_uids($index, $filter['type']) : $this->_fetch($index, $filter['type']); $result = $uids ? $this->_fetch_uids($index, $filter['type']) : $this->_fetch($index, $filter['type']);