ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring cache and session classes.

Browse Source
This commit is contained in:
Taylor Otwell
2011-10-12 21:55:05 -05:00
parent 9f7ed576c5
commit 4342f82aa9
7 changed files with 66 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
laravel/session/manager.php
View File

@@ -58,9 +58,10 @@ class Manager {
{
$session = $this->driver->load($this->transporter->get($config));
// If the session is expired, a new session will be generated and all of the data from
// the previous session will be lost. The new session will be assigned a random, long
// string ID to uniquely identify it among the application's current users.
// If the session is expired, a new session will be generated and all of
// the data from the previous session will be lost. The new session will
// be assigned a random, long string ID to uniquely identify it among
// the application's current users.
if (is_null($session) or (time() - $session['last_activity']) > ($config['lifetime'] * 60))
{
$this->exists = false;
@@ -70,10 +71,11 @@ class Manager {
$payload = new Payload($session);
// If a CSRF token is not present in the session, we will generate one. These tokens
// are generated per session to protect against Cross-Site Request Forgery attacks on
// the application. It is up to the developer to take advantage of them using the token
// methods on the Form class and the "csrf" route filter.
// If a CSRF token is not present in the session, we will generate one.
// These tokens are generated per session to protect against Cross-Site
// Request Forgery attacks on the application. It is up to the developer
// to take advantage of them using the token methods on the Form class
// and the "csrf" route filter.
if ( ! $payload->has('csrf_token'))
{
$payload->put('csrf_token', Str::random(16));
@@ -92,8 +94,9 @@ class Manager {
*/
public function close(Payload $payload, $config, $flash = array())
{
// If the session ID has been regenerated, we will need to inform the session driver
// that the session will need to be persisted to the data store as a new session.
// If the session ID has been regenerated, we will need to inform the
// session driver that the session will need to be persisted to the
// data store as a new session.
if ($payload->regenerated) $this->exists = false;
foreach ($flash as $key => $value)
@@ -105,9 +108,10 @@ class Manager {
$this->transporter->put($payload->session['id'], $config);
// Some session drivers implement the Sweeper interface, which specified that the driver
// must do its garbage collection manually. Alternatively, some drivers such as APC and
// Memcached are not required to manually clean up their sessions.
// Some session drivers may implement the Sweeper interface, meaning the
// driver must do its garbage collection manually. Alternatively, some
// drivers such as APC and Memcached are not required to manually
// clean up their sessions.
if (mt_rand(1, $config['sweepage'][1]) <= $config['sweepage'][0] and $this->driver instanceof Drivers\Sweeper)
{
$this->driver->sweep(time() - ($config['lifetime'] * 60));

11
laravel/session/payload.php
View File

@@ -1,7 +1,4 @@
<?php namespace Laravel\Session;
use Closure;
use Laravel\Str;
<?php namespace Laravel\Session; use Closure, Laravel\Str;
class Payload {
@@ -119,7 +116,7 @@ class Payload {
*/
public function reflash()
{
$this->readdress(':old:', ':new:', array_keys($this->session['data']));
$this->replace(':old:', ':new:', array_keys($this->session['data']));
}
/**
@@ -197,7 +194,7 @@ class Payload {
if (strpos($key, ':old:') === 0) $this->forget($key);
}
$this->readdress(':new:', ':old:', array_keys($this->session['data']));
$this->replace(':new:', ':old:', array_keys($this->session['data']));
return $this->session;
}
@@ -210,7 +207,7 @@ class Payload {
* @param array $keys
* @return void
*/
private function readdress($search, $replace, $keys)
private function replace($search, $replace, $keys)
{
$this->session['data'] = array_combine(str_replace($search, $replace, $keys), array_values($this->session['data']));
}