Development

Changeset 6609

You must first sign up to be able to contribute.

Changeset 6609

Show
Ignore:
Timestamp:
12/20/07 14:36:29 (5 years ago)
Author:
fabien
Message:

removed sf_timeout setting, added timeout parameter to sfBasicSecurityUser

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/data/config/factories.yml

    r6497 r6609  
    1111  user: 
    1212    class: myUser 
     13    param: 
     14      timeout:  1800 
    1315 
    1416  storage: 

  • branches/1.1/data/config/settings.yml

    r5144 r6609  
    6666    # Miscellaneous 
    6767    strip_comments:         on         # Remove comments in core framework classes as defined in the core_compile.yml 
    68     timeout:                1800       # Session timeout, in seconds 
    6968    max_forwards:           5 
    7069    path_info_array:        SERVER 

  • branches/1.1/data/skeleton/app/app/config/settings.yml

    r6128 r6609  
    8787#    # Miscellaneous 
    8888#    strip_comments:         on         # Remove comments in core framework classes as defined in the core_compile.yml 
    89 #    timeout:                1800       # Session timeout, in seconds 
    9089#    max_forwards:           5 
    9190#    path_info_array:        SERVER 

  • branches/1.1/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/config/settings.yml

    r6508 r6609  
    6161#    i18n:                   off 
    6262# 
    63 #    timeout:                1800 
    64 # 
    6563#    suffix:                 . 
    6664# 

  • branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend/config/settings.yml

    r6365 r6609  
    6060#    i18n:                   off 
    6161# 
    62 #    timeout:                1800 
    63 # 
    6462#    suffix:                 . 
    6563# 

  • branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/settings.yml

    r6365 r6609  
    6060#    i18n:                   off 
    6161# 
    62 #    timeout:                1800 
    63 # 
    6462#    suffix:                 . 
    6563# 

  • branches/1.1/lib/user/sfBasicSecurityUser.class.php

    r5706 r6609  
    229229    $this->lastRequest   = $storage->read(self::LAST_REQUEST_NAMESPACE); 
    230230 
    231     if ($this->authenticated == null) 
     231    if (is_null($this->authenticated)) 
    232232    { 
    233233      $this->authenticated = false; 
    …… 
    236236    else 
    237237    { 
    238       // Automatic logout logged in user if no request within [sf_timeout] setting 
    239       if (null !== $this->lastRequest && (time() - $this->lastRequest) > sfConfig::get('sf_timeout')) 
     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)) 
    240240      { 
    241241        if (sfConfig::get('sf_logging_enabled')) 

  • branches/1.1/test/functional/fixtures/project/apps/cache/config/settings.yml

    r6365 r6609  
    5858#    i18n:                   off 
    5959# 
    60 #    timeout:                1800 
    61 # 
    6260#    suffix:                 . 
    6361# 

  • branches/1.1/test/functional/fixtures/project/apps/frontend/config/settings.yml

    r6365 r6609  
    6262#    i18n:                   off 
    6363# 
    64 #    timeout:                1800 
    65 # 
    6664#    suffix:                 . 
    6765# 

  • branches/1.1/test/functional/fixtures/project/apps/i18n/config/settings.yml

    r6365 r6609  
    5858    i18n:                   on 
    5959# 
    60 #    timeout:                1800 
    61 # 
    6260#    suffix:                 . 
    6361# 

  • branches/1.1/test/unit/user/sfBasicSecurityUserTest.php

    r6481 r6609  
    1111require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212 
    13 $t = new lime_test(39, new lime_output_color()); 
     13$t = new lime_test(40, new lime_output_color()); 
    1414 
    1515$dispatcher = new sfEventDispatcher(); 
    …… 
    2222$t->diag('->initialize()'); 
    2323$t->todo('->initialize() times out the user if no request made for a long time'); 
    24 /* 
    25 sfConfig::set('sf_timeout', 0); 
    26 $user = new sfBasicSecurityUser($context); 
    27 $t->is($user->isTimedOut(), true, '->initialize() times out the user if no request made for a long time'); 
    28 */ 
    2924 
    3025// ->listCredentials() 
    …… 
    4338 
    4439// ->setTimedOut() ->getTimedOut() 
    45 sfConfig::set('sf_timeout', 86400); 
    4640$user = new sfBasicSecurityUser($dispatcher, $storage); 
    4741$t->diag('->setTimedOut() ->isTimedOut()'); 
    …… 
    140134$t->is($user->hasCredential('superadmin'), false); 
    141135 
     136// timeout 
     137$user->setAuthenticated(true); 
     138$user->shutdown(); 
     139$user = new sfBasicSecurityUser($dispatcher, $storage, array('timeout' => 0)); 
     140$t->is($user->isTimedOut(), true, '->initialize() times out the user if no request made for a long time'); 
     141 
    142142sfToolkit::clearDirectory($sessionPath);