From 1cf4431659de2a0ffb6cc9775938d378b77dfa5a Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Tue, 26 Jul 2011 22:11:16 -0500
Subject: [PATCH] added a few more path constants.

---
 public/index.php               | 7 +++++--
 system/cache/driver/file.php   | 8 ++++----
 system/db/connector.php        | 2 +-
 system/session/driver/file.php | 8 ++++----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/public/index.php b/public/index.php
index 8744f1c1..bc862839 100644
--- a/public/index.php
+++ b/public/index.php
@@ -12,18 +12,21 @@
 // Define the core framework paths.
 // --------------------------------------------------------------
 define('APP_PATH', realpath('../application').'/');
-define('BASE_PATH', realpath('../').'/');
-define('PUBLIC_PATH', realpath(__DIR__.'/'));
 define('SYS_PATH', realpath('../system').'/');
+define('PUBLIC_PATH', realpath(__DIR__.'/'));
+define('BASE_PATH', realpath('../').'/');
 
 // --------------------------------------------------------------
 // Define various other framework paths.
 // --------------------------------------------------------------
+define('CACHE_PATH', APP_PATH.'storage/cache/');
 define('CONFIG_PATH', APP_PATH.'config/');
+define('DATABASE_PATH', APP_PATH.'storage/db/');
 define('LIBRARY_PATH', APP_PATH.'libraries/');
 define('MODEL_PATH', APP_PATH.'models/');
 define('PACKAGE_PATH', APP_PATH.'packages/');
 define('ROUTE_PATH', APP_PATH.'routes/');
+define('SESSION_PATH', APP_PATH.'storage/sessions/');
 define('SYS_VIEW_PATH', SYS_PATH.'views/');
 define('VIEW_PATH', APP_PATH.'views/');
 
diff --git a/system/cache/driver/file.php b/system/cache/driver/file.php
index 442f1cfd..3b266d96 100644
--- a/system/cache/driver/file.php
+++ b/system/cache/driver/file.php
@@ -22,12 +22,12 @@ public function has($key)
 	 */	
 	public function get($key)
 	{
-		if ( ! file_exists(APP_PATH.'storage/cache/'.$key))
+		if ( ! file_exists(CACHE_PATH.$key))
 		{
 			return null;
 		}
 
-		$cache = file_get_contents(APP_PATH.'storage/cache/'.$key);
+		$cache = file_get_contents(CACHE_PATH.$key);
 
 		if (time() >= substr($cache, 0, 10))
 		{
@@ -49,7 +49,7 @@ public function get($key)
 	 */
 	public function put($key, $value, $minutes)
 	{
-		file_put_contents(APP_PATH.'storage/cache/'.$key, (time() + ($minutes * 60)).serialize($value), LOCK_EX);
+		file_put_contents(CACHE_PATH.$key, (time() + ($minutes * 60)).serialize($value), LOCK_EX);
 	}
 
 	/**
@@ -60,7 +60,7 @@ public function put($key, $value, $minutes)
 	 */
 	public function forget($key)
 	{
-		@unlink(APP_PATH.'storage/cache/'.$key);
+		@unlink(CACHE_PATH.$key);
 	}
 
 }
\ No newline at end of file
diff --git a/system/db/connector.php b/system/db/connector.php
index 13d44184..769f4f27 100644
--- a/system/db/connector.php
+++ b/system/db/connector.php
@@ -54,7 +54,7 @@ public static function connect($connection)
 	 */
 	private static function connect_to_sqlite($config)
 	{
-		if (file_exists($path = APP_PATH.'storage/db/'.$config->database.'.sqlite'))
+		if (file_exists($path = DATABASE_PATH.$config->database.'.sqlite'))
 		{
 			return new \PDO('sqlite:'.$path, null, null, static::$options);
 		}
diff --git a/system/session/driver/file.php b/system/session/driver/file.php
index 47c70f10..e6788ab0 100644
--- a/system/session/driver/file.php
+++ b/system/session/driver/file.php
@@ -10,7 +10,7 @@ class File implements \System\Session\Driver {
 	 */
 	public function load($id)
 	{
-		if (file_exists($path = APP_PATH.'storage/sessions/'.$id))
+		if (file_exists($path = SESSION_PATH.$id))
 		{
 			return unserialize(file_get_contents($path));
 		}
@@ -24,7 +24,7 @@ public function load($id)
 	 */
 	public function save($session)
 	{
-		file_put_contents(APP_PATH.'storage/sessions/'.$session['id'], serialize($session), LOCK_EX);
+		file_put_contents(SESSION_PATH.$session['id'], serialize($session), LOCK_EX);
 	}
 
 	/**
@@ -35,7 +35,7 @@ public function save($session)
 	 */
 	public function delete($id)
 	{
-		@unlink(APP_PATH.'storage/sessions/'.$id);
+		@unlink(SESSION_PATH.$id);
 	}
 
 	/**
@@ -46,7 +46,7 @@ public function delete($id)
 	 */
 	public function sweep($expiration)
 	{
-		foreach (glob(APP_PATH.'storage/sessions/*') as $file)
+		foreach (glob(SESSION_PATH.'*') as $file)
 		{
 			if (filetype($file) == 'file' and filemtime($file) < $expiration)
 			{