Updates from lnApp

application/bootstrap.php

@@ -82,6 +82,8 @@ if (isset($_SERVER['KOHANA_ENV']))
 Kohana::init(array(
 	'base_url'   => '/osb',
 	'index_file' => '',
+	'caching'    => TRUE,
+	'cache_dir'  => '/dev/shm/lnapp',
 ));
 
 /**
@@ -124,16 +126,6 @@ Route::set('sections', '<directory>/<controller>(/<action>(/<id>(/<sid>)))',
 		'directory' => '('.implode('|',Kohana::config('config.method_directory')).')'
 	));
 
-/**
- * Set the routes. Each route must have a minimum of a name, a URI and a set of
- * defaults for the URI.
- */
-Route::set('default', '(<controller>(/<action>(/<id>)))')
-	->defaults(array(
-		'controller' => 'welcome',
-		'action'     => 'index',
-	));
-
 // Static file serving (CSS, JS, images)
 Route::set('default/media', 'media(/<file>)', array('file' => '.+'))
 	->defaults(array(
@@ -141,3 +133,14 @@ Route::set('default/media', 'media(/<file>)', array('file' => '.+'))
 		'action'     => 'media',
 		'file'       => NULL,
 	));
+
+/**
+ * Set the routes. Each route must have a minimum of a name, a URI and a set of
+ * defaults for the URI.
+ */
+Route::set('default', '(<controller>(/<action>(/<id>)))', array('id' => '[a-zA-Z0-9_.-]+'))
+	->defaults(array(
+		'controller' => 'welcome',
+		'action'     => 'index',
+	));
+?>