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

Adapt to kolab_storage_folder optimizations: don't cast resultset into array (#2828)

Browse source
This commit is contained in:
Thomas Bruederli 2014-02-06 17:30:40 +01:00
parent 2ade247a0c
commit 69b7803f25
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -233,7 +233,7 @@ class kolab_calendar
} }
$events = array(); $events = array();
foreach ((array)$this->storage->select($query) as $record) { foreach ($this->storage->select($query) as $record) {
$event = $this->_to_rcube_event($record); $event = $this->_to_rcube_event($record);
$this->events[$event['id']] = $event; $this->events[$event['id']] = $event;

2
plugins/kolab_config/kolab_config.php
View file

@ -167,7 +167,7 @@ class kolab_config extends rcube_plugin
if ($default && !$folder->default) if ($default && !$folder->default)
continue; continue;
foreach ((array)$folder->select($query) as $object) { foreach ($folder->select($query) as $object) {
if ($object['type'] == 'dictionary' && ($object['language'] == $lang || $object['language'] == 'XX')) { if ($object['type'] == 'dictionary' && ($object['language'] == $lang || $object['language'] == 'XX')) {
if (is_array($this->dicts[$lang])) if (is_array($this->dicts[$lang]))
$this->dicts[$lang]['e'] = array_merge((array)$this->dicts[$lang]['e'], $object['e']); $this->dicts[$lang]['e'] = array_merge((array)$this->dicts[$lang]['e'], $object['e']);

8
plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
View file

@ -294,7 +294,7 @@ class tasklist_kolab_driver extends tasklist_driver
$counts = array('all' => 0, 'flagged' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'nodate' => 0); $counts = array('all' => 0, 'flagged' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'nodate' => 0);
foreach ($lists as $list_id) { foreach ($lists as $list_id) {
$folder = $this->folders[$list_id]; $folder = $this->folders[$list_id];
foreach ((array)$folder->select(array(array('tags','!~','x-complete'))) as $record) { foreach ($folder->select(array(array('tags','!~','x-complete'))) as $record) {
$rec = $this->_to_rcube_task($record); $rec = $this->_to_rcube_task($record);
if ($rec['complete'] >= 1.0) // don't count complete tasks if ($rec['complete'] >= 1.0) // don't count complete tasks
@ -358,7 +358,7 @@ class tasklist_kolab_driver extends tasklist_driver
foreach ($lists as $list_id) { foreach ($lists as $list_id) {
$folder = $this->folders[$list_id]; $folder = $this->folders[$list_id];
foreach ((array)$folder->select($query) as $record) { foreach ($folder->select($query) as $record) {
$task = $this->_to_rcube_task($record); $task = $this->_to_rcube_task($record);
$task['list'] = $list_id; $task['list'] = $list_id;
@ -421,7 +421,7 @@ class tasklist_kolab_driver extends tasklist_driver
$query_ids = array(); $query_ids = array();
foreach ($task_ids as $task_id) { foreach ($task_ids as $task_id) {
$query = array(array('tags','=','x-parent:' . $task_id)); $query = array(array('tags','=','x-parent:' . $task_id));
foreach ((array)$folder->select($query) as $record) { foreach ($folder->select($query) as $record) {
// don't rely on kolab_storage_folder filtering // don't rely on kolab_storage_folder filtering
if ($record['parent_id'] == $task_id) { if ($record['parent_id'] == $task_id) {
$childs[] = $record['uid']; $childs[] = $record['uid'];
@ -475,7 +475,7 @@ class tasklist_kolab_driver extends tasklist_driver
continue; continue;
$folder = $this->folders[$lid]; $folder = $this->folders[$lid];
foreach ((array)$folder->select($query) as $record) { foreach ($folder->select($query) as $record) {
if (!$record['alarms']) // don't trust query :-) if (!$record['alarms']) // don't trust query :-)
continue; continue;