Revision: 1512
http://mrbs.svn.sourceforge.net/mrbs/?rev=1512&view=rev
Author: jberanek
Date: 2010-10-18 16:32:17 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
* Added support for setting 'cookie' session scheme to use only
session cookies. For this set
$auth["session_cookie"]["session_expire_time"] to 0. Fixed token
checking code, so this it takes notice of this variable.
Modified Paths:
--------------
mrbs/trunk/web/session_cookie.inc
Modified: mrbs/trunk/web/session_cookie.inc
===================================================================
--- mrbs/trunk/web/session_cookie.inc 2010-10-18 16:10:43 UTC (rev 1511)
+++ mrbs/trunk/web/session_cookie.inc 2010-10-18 16:32:17 UTC (rev 1512)
@@ -82,7 +82,14 @@
$UserPassword = $NewUserPassword;
}
- $expiry_time = time()+$auth['session_cookie']['session_expire_time'];
+ if ($auth['session_cookie']['session_expire_time'] == 0)
+ {
+ $expiry_time = 0;
+ }
+ else
+ {
+ $expiry_time = time()+$auth['session_cookie']['session_expire_time'];
+ }
$token = "AUTH".$UserName."|".$expiry_time;
if ($auth['session_cookie']['include_ip'])
{
@@ -196,7 +203,7 @@
function getUserName()
{
- global $blowfish, $REMOTE_ADDR;
+ global $blowfish, $REMOTE_ADDR, $auth;
$encrypted_token = NULL;
$username = NULL;
@@ -227,11 +234,16 @@
/* Check for a valid token */
if (isset($parts[0]) &&
- isset($parts[1]) && ($parts[1] > time()) &&
- (!isset($parts[2]) ||
- (isset($parts[2]) && ($parts[2] == $REMOTE_ADDR))))
+ isset($parts[1]))
{
- $username = $parts[0];
+ error_log("expiry is ".$parts[1]);
+ if (((($auth["session_cookie"]["session_expire_time"] == 0) &&
+ ($parts[1] == 0)) || ($parts[1] > time())) &&
+ (!isset($parts[2]) ||
+ (isset($parts[2]) && ($parts[2] == $REMOTE_ADDR))))
+ {
+ $username = $parts[0];
+ }
}
else
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
