fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

last fix to avoid warnings on the core endpoints

Browse Source
This commit is contained in:
Erik
2015-04-24 22:25:36 -05:00
parent af085c3e71
commit 2534325405
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
framework/src/Maveriks/WebApplication.php
View File

@@ -315,19 +315,6 @@ class WebApplication
$this->rest->setOverridingFormats('JsonFormat', 'UploadFormat'); $this->rest->setOverridingFormats('JsonFormat', 'UploadFormat');
$isPluginRequest = strpos($uri, '/plugin-') !== false ? true : false;
if ($isPluginRequest) {
$tmp = explode('/', $uri);
array_shift($tmp);
$tmp = array_shift($tmp);
$tmp = explode('-', $tmp);
$pluginName = $tmp[1];
$uri = str_replace('/plugin-'.$pluginName, '', $uri);
}
// Override $_SERVER['REQUEST_URI'] to Restler handles the modified url
// scan all api directory to find api classes // scan all api directory to find api classes
$classesList = Util\Common::rglob($apiDir . "/*"); $classesList = Util\Common::rglob($apiDir . "/*");
@@ -356,20 +343,32 @@ class WebApplication
} }
} }
//if (! $isPluginRequest) { // if it is not a request for a plugin endpoint //
// Register API Plugins classes
$isPluginRequest = strpos($uri, '/plugin-') !== false ? true : false;
if ($isPluginRequest) {
$tmp = explode('/', $uri);
array_shift($tmp);
$tmp = array_shift($tmp);
$tmp = explode('-', $tmp);
$pluginName = $tmp[1];
$uri = str_replace('/plugin-'.$pluginName, '', $uri);
}
// hook to get rest api classes from plugins // hook to get rest api classes from plugins
if (class_exists('PMPluginRegistry') && file_exists(PATH_DATA_SITE . 'plugin.singleton')) { if (class_exists('PMPluginRegistry') && file_exists(PATH_DATA_SITE . 'plugin.singleton')) {
$pluginRegistry = \PMPluginRegistry::loadSingleton(PATH_DATA_SITE . 'plugin.singleton'); $pluginRegistry = \PMPluginRegistry::loadSingleton(PATH_DATA_SITE . 'plugin.singleton');
$plugins = $pluginRegistry->getRegisteredRestServices(); $plugins = $pluginRegistry->getRegisteredRestServices();
if (! empty($plugins)) { if (! empty($plugins)) {
foreach ($plugins as $pluginName => $plugin) {
$pluginSourceDir = PATH_PLUGINS . $pluginName . DIRECTORY_SEPARATOR . 'src'; $pluginSourceDir = PATH_PLUGINS . $pluginName . DIRECTORY_SEPARATOR . 'src';
$loader = \Maveriks\Util\ClassLoader::getInstance(); $loader = \Maveriks\Util\ClassLoader::getInstance();
$loader->add($pluginSourceDir); $loader->add($pluginSourceDir);
if (is_array($plugins) && array_key_exists($pluginName, $plugins)) { foreach ($plugin as $class) {
foreach ($plugins[$pluginName] as $class) {
if (class_exists($class['namespace'])) { if (class_exists($class['namespace'])) {
$this->rest->addAPIClass($class['namespace']); $this->rest->addAPIClass($class['namespace']);
} }
@@ -597,3 +596,4 @@ class WebApplication
@unlink(PATH_DATA . 'sites' . DS . $workspace . DS . 'api-config.php'); @unlink(PATH_DATA . 'sites' . DS . $workspace . DS . 'api-config.php');
} }
} }