From: Andrew Dolgov <fox@bah.spb.su>
Date: Fri, 2 Mar 2007 11:12:04 +0000 (+0100)
Subject: login system fixes
X-Git-Tag: 1.2.9~66
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f7c390b8787fbf5cf0fbc3cb8c1396454edb7b28;p=tt-rss.git

login system fixes
---

diff --git a/config.php-dist b/config.php-dist
index bbf45869..6ccd0d8c 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -108,15 +108,12 @@
 	// Bind session to client IP address (recommended)
 
 	define('SESSION_COOKIE_LIFETIME', 0);
-	// Default lifetime of a session cookie. In seconds, 
-	// 0 means delete on browser close
-
-	define('SESSION_COOKIE_LIFETIME_REMEMBER', 86400);
-	// Session cookie lifetime if "remember me" is checked on login.
+	// Default lifetime of a session (e.g. login) cookie. In seconds, 
+	// 0 means cookie will be deleted when browser closes.
 
 	define('SESSION_EXPIRE_TIME', 86400);
 	// Hard expiration limit for sessions. Should be
-	// >= SESSION_COOKIE_LIFETIME_REMEMBER
+	// greater or equal to SESSION_COOKIE_LIFETIME
 
 	define('DAEMON_UPDATE_LOGIN_LIMIT', 0);
 	// Stop updating feeds of user who was never logged in
diff --git a/sanity_check.php b/sanity_check.php
index 636fcd82..b77c9797 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -46,9 +46,9 @@
 		$err_msg = _("config: SESSION_EXPIRE_TIME is too low (less than 60)");
 	}
 
-	if (SESSION_EXPIRE_TIME < SESSION_COOKIE_LIFETIME_REMEMBER) {
+	if (SESSION_EXPIRE_TIME < SESSION_COOKIE_LIFETIME) {
 		$err_msg = _("config: SESSION_EXPIRE_TIME should be greater or equal to" .
-			"SESSION_COOKIE_LIFETIME_REMEMBER");
+			"SESSION_COOKIE_LIFETIME");
 	}
 
 /*	if (defined('DISABLE_SESSIONS')) {