diff options
| -rw-r--r-- | program/include/main.inc | 2 | ||||
| -rwxr-xr-x | program/include/rcube_mdb2.inc | 22 | ||||
| -rw-r--r-- | program/js/app.js | 2 |
3 files changed, 24 insertions, 2 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index c084588cf..02f5b5713 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -185,7 +185,7 @@ function rcmail_authenticate_session() // renew auth cookie every 5 minutes (only for GET requests) if (!$valid || ($_SERVER['REQUEST_METHOD']!='POST' && $now-$_SESSION['auth_time'] > 300)) { - $_SESSION['last_auth'] = $_SESSION['auth_time']; + $_SESSION['last_auth'] = $_SESSION['auth_time']; $_SESSION['auth_time'] = $now; setcookie('sessauth', rcmail_auth_hash(session_id(), $now)); } diff --git a/program/include/rcube_mdb2.inc b/program/include/rcube_mdb2.inc index eec975c69..d37230268 100755 --- a/program/include/rcube_mdb2.inc +++ b/program/include/rcube_mdb2.inc @@ -411,6 +411,25 @@ class rcube_db /** + * Return SQL function for current time and date + * + * @return string SQL function to use in query + * @access public + */ + function now() + { + switch($this->db_provider) + { + case 'mssql': + return "getdate()"; + + default: + return "now()"; + } + } + + + /** * Return SQL statement to convert a field value into a unix timestamp * * @param string Field name @@ -425,6 +444,9 @@ class rcube_db return "EXTRACT (EPOCH FROM $field)"; break; + case 'mssql': + return "datediff(s, '1970-01-01 00:00:00', $field)"; + default: return "UNIX_TIMESTAMP($field)"; } diff --git a/program/js/app.js b/program/js/app.js index 8d2f1ed5b..d52efae1b 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -49,7 +49,7 @@ function rcube_webmail() 'application/x-shockwave-flash'); // default environment vars - this.env.keep_alive = 50; // seconds + this.env.keep_alive = 60; // seconds this.env.request_timeout = 180; // seconds this.env.draft_autosave = 0; // seconds |