summaryrefslogtreecommitdiff
path: root/program/include/rcube_session.php
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-09-09 20:23:56 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-09-09 20:23:56 +0200
commit99d9f50a0000447d0a752e6c43716237dc0da176 (patch)
tree0b958b9711d09c4da74f076e1b902ffa32a4a0a1 /program/include/rcube_session.php
parenta1303514933afe2d867067e4b95412c79652c89b (diff)
parent4e383e2ec8b4184c0fe74d02cf30fd3a4078128e (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/include/rcube_session.php')
-rw-r--r--program/include/rcube_session.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index b6a0ccf62..6192466cd 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -531,7 +531,7 @@ class rcube_session
public function set_keep_alive($keep_alive)
{
$this->keep_alive = $keep_alive;
-
+
if ($this->lifetime < $keep_alive)
$this->set_lifetime($keep_alive + 30);
}
@@ -551,7 +551,7 @@ class rcube_session
{
return $this->ip;
}
-
+
/**
* Setter for cookie encryption secret
*/
@@ -568,7 +568,8 @@ class rcube_session
{
$this->ip_check = $check;
}
-
+
+
/**
* Setter for the cookie name used for session cookie
*/
@@ -605,7 +606,7 @@ class rcube_session
$result = true;
}
}
- }
+ }
if (!$result)
$this->log("Session authentication failed for " . $this->key . "; invalid auth cookie sent; timeslot = " . date('Y-m-d H:i:s', $prev));
@@ -637,7 +638,7 @@ class rcube_session
}
/**
- *
+ * Writes debug information to the log
*/
function log($line)
{