diff --git a/application/bootstrap.php b/application/bootstrap.php index 13df3f5e..751950d1 100644 --- a/application/bootstrap.php +++ b/application/bootstrap.php @@ -124,9 +124,12 @@ Kohana::modules(array_merge(Kohana::modules(),Config::modules())); /** * Enable specalised interfaces */ -Route::set('sections', '//((/(/)))', +Route::set('sections', '/(/(/(/)))', array( 'directory' => '('.implode('|',Kohana::config('config.method_directory')).')' + )) + ->defaults(array( + 'action' => 'index', )); // Static file serving (CSS, JS, images) @@ -134,14 +137,13 @@ Route::set('default/media', 'media(/)', array('file' => '.+')) ->defaults(array( 'controller' => 'welcome', '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', '(/(/))', array('id' => '[a-zA-Z0-9_.-]+')) +Route::set('default', '((/(/)))', array('id' => '[a-zA-Z0-9_.-]+')) ->defaults(array( 'controller' => 'welcome', 'action' => 'index', diff --git a/application/classes/controller/welcome.php b/application/classes/controller/welcome.php index 2a037616..741c2fca 100644 --- a/application/classes/controller/welcome.php +++ b/application/classes/controller/welcome.php @@ -17,9 +17,6 @@ class Controller_Welcome extends Controller_TemplateDefault { if (! Kohana::config('config.appname')) Request::current()->redirect('guide/app'); - if (! Auth::instance()->logged_in()) - Request::current()->redirect('login'); - Block::add(array( 'title'=>'Welcome to lnApp (public)!', 'subtitle'=>'Using lnApp',