Changeset 6658
- Timestamp:
- 12/21/07 07:48:12 (10 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.1/lib/user/sfBasicSecurityUser.class.php
r6609 r6658 236 236 else 237 237 { 238 // Automatic logout logged in user if no request within timeout parameter 239 if (!is_null($this->lastRequest) && time() - $this->lastRequest >= $this->getParameter('timeout', 1800)) 238 // Automatic logout logged in user if no request within timeout parameter seconds 239 $timeout = $this->getParameter('timeout', 1800); 240 if (false !== $timeout && !is_null($this->lastRequest) && time() - $this->lastRequest >= $timeout) 240 241 { 241 242 if (sfConfig::get('sf_logging_enabled')) branches/1.1/test/unit/user/sfBasicSecurityUserTest.php
r6609 r6658 11 11 require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 12 12 13 $t = new lime_test(4 0, new lime_output_color());13 $t = new lime_test(41, new lime_output_color()); 14 14 15 15 $dispatcher = new sfEventDispatcher(); … … 140 140 $t->is($user->isTimedOut(), true, '->initialize() times out the user if no request made for a long time'); 141 141 142 $user = new sfBasicSecurityUser($dispatcher, $storage, array('timeout' => false)); 143 $t->is($user->isTimedOut(), false, '->initialize() takes a timeout parameter which can be false to disable session timeout'); 144 142 145 sfToolkit::clearDirectory($sessionPath);