From 17860b4af160a6b4a01178cfd01fbc7f8271fccf Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 9 Apr 2014 22:10:34 +0200 Subject: add requirements to route --- appinfo/routes.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/appinfo/routes.php b/appinfo/routes.php index 0cb9c2b1e..e036bf803 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -32,7 +32,7 @@ use \OCA\News\App\News; $app = new News(); $app->registerRoutes($this, array( 'routes' => array( - ///////////////// Website + // page array('name' => 'page#index', 'url' => '/', 'verb' => 'GET'), array('name' => 'page#settings', 'url' => '/settings', 'verb' => 'GET'), @@ -73,12 +73,12 @@ $app->registerRoutes($this, array( array('name' => 'export#opml', 'url' => '/export/opml', 'verb' => 'GET'), array('name' => 'export#articles', 'url' => '/export/articles', 'verb' => 'GET'), - ///////////////// API - // Generic + // API array('name' => 'api#version', 'url' => '/api/v1-2/version', 'verb' => 'GET'), array('name' => 'api#update', 'url' => '/api/v1-2/update', 'verb' => 'GET'), array('name' => 'api#before_update', 'url' => '/api/v1-2/cleanup/before-update', 'verb' => 'GET'), array('name' => 'api#after_update', 'url' => '/api/v1-2/cleanup/after-update', 'verb' => 'GET'), + array('name' => 'api#cors', 'url' => '/api/v1-2/{path}', 'verb' => 'OPTIONS', 'requirements' => array('path' => '.+')), // folders array('name' => 'folder_api#index', 'url' => '/api/v1-2/folders', 'verb' => 'GET'), @@ -112,10 +112,3 @@ $app->registerRoutes($this, array( ) )); - -$this->create('news_api_cors', '/api/v1-2/{path}')->method('options')->action( - function($params) { - $app = new News($params); - $app->dispatch('ApiController', 'cors'); - } -)->requirements(array('path' => '.+')); \ No newline at end of file -- cgit v1.2.3