summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2012-11-17 08:49:57 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-01-25 21:00:34 (GMT)
commit27c5e65753d459d5eb5af476d1fa4dbb267b4288 (patch)
treef797d5239d5cbc3f51119325ef723be5ab2037b4
parentbbbdb5e073810618ca31cba7a753fe046dc5361e (diff)
downloadroundcubemail-plugins-kolab-27c5e65753d459d5eb5af476d1fa4dbb267b4288.tar.gz
Fixes for keep-alive -> refresh change in Roundcube core
-rw-r--r--plugins/calendar/calendar.php2
-rw-r--r--plugins/calendar/drivers/kolab/kolab_driver.php2
-rw-r--r--plugins/libcalendaring/libcalendaring.php4
-rw-r--r--plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 24ab592..e344c40 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1542,7 +1542,7 @@ class calendar extends rcube_plugin
{
if ($p['action'] == 'attend') {
$this->rc->output->set_env('task', 'calendar'); // override some env vars
- $this->rc->output->set_env('keep_alive', 0);
+ $this->rc->output->set_env('refresh_interval', 0);
$this->rc->output->set_pagetitle($this->gettext('calendar'));
$itip = $this->load_itip();
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 4bc1f63..a5e2345 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -663,7 +663,7 @@ class kolab_driver extends calendar_driver
$slot = $time;
$slot -= $slot % $interval;
- $last = $time - max(60, $this->rc->session->get_keep_alive());
+ $last = $time - max(60, $this->rc->config->get('refresh_interval', 0));
$last -= $last % $interval;
// only check for alerts once in 5 minutes
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index ea174f2..b9883f3 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -90,7 +90,7 @@ class libcalendaring extends rcube_plugin
$this->include_stylesheet($this->local_skin_path() . '/libcal.css');
// add hook to display alarms
- $this->add_hook('keep_alive', array($this, 'keep_alive'));
+ $this->add_hook('refresh', array($this, 'refresh'));
$this->register_action('plugin.alarms', array($this, 'alarms_action'));
}
@@ -377,7 +377,7 @@ class libcalendaring extends rcube_plugin
* Handler for keep-alive requests
* This will check for pending notifications and pass them to the client
*/
- public function keep_alive($attr)
+ public function refresh($attr)
{
// collect pending alarms from all providers (e.g. calendar, tasks)
$plugin = $this->rc->plugins->exec_hook('pending_alarms', array(
diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index f6ebe14..34e9fa0 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -427,7 +427,7 @@ class tasklist_kolab_driver extends tasklist_driver
$slot = $time;
$slot -= $slot % $interval;
- $last = $time - max(60, $this->rc->session->get_keep_alive());
+ $last = $time - max(60, $this->rc->config->get('refresh_interval', 0));
$last -= $last % $interval;
// only check for alerts once in 5 minutes