From 99d9f50a0000447d0a752e6c43716237dc0da176 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 09 Sep 2012 14:23:56 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/include/rcube_session.php | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index b6a0ccf..6192466 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -531,7 +531,7 @@
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 @@
{
return $this->ip;
}
-
+
/**
* Setter for cookie encryption secret
*/
@@ -568,7 +568,8 @@
{
$this->ip_check = $check;
}
-
+
+
/**
* Setter for the cookie name used for session cookie
*/
@@ -605,7 +606,7 @@
$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 @@
}
/**
- *
+ * Writes debug information to the log
*/
function log($line)
{
--
Gitblit v1.9.1