wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move loading of routes to OC_Router

Browse source
This commit is contained in:
Bart Visscher 2012-07-30 20:48:03 +02:00
parent 372fdf8077
commit 0271bfa3b7
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/api.php
View file

@ -53,10 +53,6 @@ class OC_API {
* @param array $parameters
*/
public static function call($parameters){
// Get the routes
self::loadRoutes();
$name = $parameters['_name'];
// Loop through registered actions
foreach(self::$actions[$name] as $action){
@ -104,21 +100,6 @@ class OC_API {
return $finalresponse;
}
/**
* loads the api routes
*/
private static function loadRoutes(){
// TODO cache
foreach(OC_APP::getEnabledApps() as $app){
$file = OC_App::getAppPath($app).'/appinfo/routes.php';
if(file_exists($file)){
require_once($file);
}
}
// include core routes
require_once(OC::$SERVERROOT.'ocs/routes.php');
}
/**
* respond to a call
* @param int|array $response the response

15
lib/router.php
View file

@ -16,6 +16,21 @@ class OC_Router {
protected $collections = array();
protected $collection = null;
/**
* loads the api routes
*/
public function loadRoutes(){
// TODO cache
foreach(OC_APP::getEnabledApps() as $app){
$file = OC_App::getAppPath($app).'/appinfo/routes.php';
if(file_exists($file)){
require_once($file);
}
}
// include ocs routes
require_once(OC::$SERVERROOT.'/ocs/routes.php');
}
public function useCollection($name) {
if (!isset($this->collections[$name])) {
$this->collections[$name] = new RouteCollection();