From a3e8d5ae2621b0015f99126170a0660c9866d699 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Mon, 8 Aug 2011 09:58:44 -0500
Subject: [PATCH] Refactoring the session class.

---
 system/session.php | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/system/session.php b/system/session.php
index c2ca15eb..373e325c 100644
--- a/system/session.php
+++ b/system/session.php
@@ -46,6 +46,8 @@ class Session {
 					throw new \Exception("Session driver [$driver] is not supported.");
 			}			
 		}
+
+		return static::$driver;
 	}
 
 	/**
@@ -63,10 +65,7 @@ class Session {
 			static::$session = array('id' => Str::random(40), 'data' => array());
 		}
 
-		if ( ! static::has('csrf_token'))
-		{
-			static::put('csrf_token', Str::random(16));
-		}
+		if ( ! static::has('csrf_token')) static::put('csrf_token', Str::random(16));
 
 		static::$session['last_activity'] = time();
 	}
@@ -191,19 +190,11 @@ class Session {
 
 		static::driver()->save(static::$session);
 
-		$config = Config::get('session');
+		static::write_cookie();
 
-		if ( ! headers_sent())
-		{
-			$minutes = ($config['expire_on_close']) ? 0 : $config['lifetime'];
-
-			Cookie::put('laravel_session', static::$session['id'], $minutes, $config['path'], $config['domain'], $config['https'], $config['http_only']);
-		}
-
-		// 2% chance of performing session garbage collection on any given request...
 		if (mt_rand(1, 100) <= 2 and static::driver() instanceof Session\Sweeper)
 		{
-			static::driver()->sweep(time() - ($config['lifetime'] * 60));
+			static::driver()->sweep(time() - (Config::get('session.lifetime') * 60));
 		}
 	}
 
@@ -233,4 +224,21 @@ class Session {
 		}
 	}
 
+	/**
+	 * Write the session cookie.
+	 *
+	 * @return void
+	 */
+	private static function write_cookie()
+	{
+		extract(Config::get('session'));
+
+		if ( ! headers_sent())
+		{
+			$minutes = ($expire_on_close) ? 0 : $lifetime;
+
+			Cookie::put('laravel_session', static::$session['id'], $minutes, $path, $domain, $https, $http_only);
+		}
+	}
+
 }
\ No newline at end of file