summaryrefslogtreecommitdiff
path: root/program/include/rcmail.php
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-11-17 16:24:09 +0100
committerThomas Bruederli <thomas@roundcube.net>2012-11-17 16:24:09 +0100
commit6ddb16d181e285d4f0ef0ef55bdd0ba787f1b583 (patch)
tree5f186f89d5d7f77592acf3aec676b48367a96d48 /program/include/rcmail.php
parentbc66f7d6d208ac99dcec57992c4eb955570d85bc (diff)
parent9ab34604d94270f6c1795c7dd7b615273d05db0c (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/include/rcmail.php')
-rw-r--r--program/include/rcmail.php16
1 files changed, 7 insertions, 9 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 3728e5d19..99a68e81d 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -94,9 +94,6 @@ class rcmail extends rcube
// create user object
$this->set_user(new rcube_user($_SESSION['user_id']));
- // configure session (after user config merge!)
- $this->session_configure();
-
// set task and action properties
$this->set_task(rcube_utils::get_input_value('_task', rcube_utils::INPUT_GPC));
$this->action = asciiwords(rcube_utils::get_input_value('_action', rcube_utils::INPUT_GPC));
@@ -320,10 +317,9 @@ class rcmail extends rcube
if (!($this->output instanceof rcube_output_html))
$this->output = new rcube_output_html($this->task, $framed);
- // set keep-alive/check-recent interval
- if ($this->session && ($keep_alive = $this->session->get_keep_alive())) {
- $this->output->set_env('keep_alive', $keep_alive);
- }
+ // set refresh interval
+ $this->output->set_env('refresh_interval', $this->config->get('refresh_interval', 0));
+ $this->output->set_env('session_lifetime', $this->config->get('session_lifetime', 0) * 60);
if ($framed) {
$this->comm_path .= '&_framed=1';
@@ -336,7 +332,7 @@ class rcmail extends rcube
$this->output->set_charset(RCMAIL_CHARSET);
// add some basic labels to client
- $this->output->add_label('loading', 'servererror', 'requesttimedout');
+ $this->output->add_label('loading', 'servererror', 'requesttimedout', 'refreshing');
return $this->output;
}
@@ -522,7 +518,6 @@ class rcmail extends rcube
// Configure environment
$this->set_user($user);
$this->set_storage_prop();
- $this->session_configure();
// fix some old settings according to namespace prefix
$this->fix_namespace_settings($user);
@@ -775,6 +770,7 @@ class rcmail extends rcube
}
}
+
/**
* Registers action aliases for current task
*
@@ -789,6 +785,7 @@ class rcmail extends rcube
}
}
+
/**
* Returns current action filename
*
@@ -803,6 +800,7 @@ class rcmail extends rcube
return strtr($this->action, '-', '_') . '.inc';
}
+
/**
* Fixes some user preferences according to namespace handling change.
* Old Roundcube versions were using folder names with removed namespace prefix.