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

Fix event reading/caching in database backend

Browse source
This commit is contained in:
Thomas 2011-08-04 23:55:41 +02:00
parent c8c640dc0c
commit 8c36e7d88f
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/calendar/drivers/database/database_driver.php
View file

@ -34,6 +34,7 @@ class database_driver extends calendar_driver
private $rc; private $rc;
private $cal; private $cal;
private $cache = array();
private $calendars = array(); private $calendars = array();
private $calendar_ids = ''; private $calendar_ids = '';
private $free_busy_map = array('free' => 0, 'busy' => 1, 'out-of-office' => 2, 'outofoffice' => 2, 'tentative' => 3); private $free_busy_map = array('free' => 0, 'busy' => 1, 'out-of-office' => 2, 'outofoffice' => 2, 'tentative' => 3);
@ -215,6 +216,8 @@ class database_driver extends calendar_driver
$event_id = $this->rc->db->insert_id($this->sequence_events); $event_id = $this->rc->db->insert_id($this->sequence_events);
if ($event_id) { if ($event_id) {
$this->cache[$eventid] = $event;
// add attachments // add attachments
if (!empty($event['attachments'])) { if (!empty($event['attachments'])) {
foreach ($event['attachments'] as $attachment) { foreach ($event['attachments'] as $attachment) {
@ -440,8 +443,11 @@ class database_driver extends calendar_driver
} }
} }
if ($success && $update_recurring) if ($success) {
unset($this->cache[$event['id']]);
if ($update_recurring)
$this->_update_recurring($event); $this->_update_recurring($event);
}
return $success; return $success;
} }
@ -609,12 +615,10 @@ class database_driver extends calendar_driver
*/ */
public function get_event($event) public function get_event($event)
{ {
static $cache = array();
$id = is_array($event) ? $event['id'] : $event; $id = is_array($event) ? $event['id'] : $event;
if ($cache[$id]) if ($this->cache[$id])
return $cache[$id]; return $this->cache[$id];
$result = $this->rc->db->query(sprintf( $result = $this->rc->db->query(sprintf(
"SELECT * FROM " . $this->db_events . " "SELECT * FROM " . $this->db_events . "
@ -625,8 +629,8 @@ class database_driver extends calendar_driver
$id); $id);
if ($result && ($event = $this->rc->db->fetch_assoc($result))) { if ($result && ($event = $this->rc->db->fetch_assoc($result))) {
$cache[$id] = $this->_read_postprocess($event); $this->cache[$id] = $this->_read_postprocess($event);
return $cache[$id]; return $this->cache[$id];
} }
return false; return false;