mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove OC_App dependancy from OC_API::mergeResponses()

This commit is contained in:
tomneedham 2013-11-13 22:46:24 +00:00
parent dc30056025
commit f19caeed33
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/private/api.php
View File

@ -96,6 +96,7 @@ class OC_API {
$responses[] = array( $responses[] = array(
'app' => $action['app'], 'app' => $action['app'],
'response' => new OC_OCS_Result(null, OC_API::RESPOND_UNAUTHORISED, 'Unauthorised'), 'response' => new OC_OCS_Result(null, OC_API::RESPOND_UNAUTHORISED, 'Unauthorised'),
'shipped' => OC_App::isShipped($action['app']),
); );
continue; continue;
} }
@ -103,6 +104,7 @@ class OC_API {
$responses[] = array( $responses[] = array(
'app' => $action['app'], 'app' => $action['app'],
'response' => new OC_OCS_Result(null, OC_API::RESPOND_NOT_FOUND, 'Api method not found'), 'response' => new OC_OCS_Result(null, OC_API::RESPOND_NOT_FOUND, 'Api method not found'),
'shipped' => OC_App::isShipped($action['app']),
); );
continue; continue;
} }
@ -110,6 +112,7 @@ class OC_API {
$responses[] = array( $responses[] = array(
'app' => $action['app'], 'app' => $action['app'],
'response' => call_user_func($action['action'], $parameters), 'response' => call_user_func($action['action'], $parameters),
'shipped' => OC_App::isShipped($action['app']),
); );
} }
$response = self::mergeResponses($responses); $response = self::mergeResponses($responses);
@ -127,7 +130,7 @@ class OC_API {
* merge the returned result objects into one response * merge the returned result objects into one response
* @param array $responses * @param array $responses
*/ */
private static function mergeResponses($responses) { public static function mergeResponses($responses) {
$response = array(); $response = array();
// Sort into shipped and thirdparty // Sort into shipped and thirdparty
$shipped = array( $shipped = array(
@ -140,17 +143,17 @@ class OC_API {
); );
foreach($responses as $response) { foreach($responses as $response) {
if(OC_App::isShipped($response['app']) || ($response['app'] === 'core')) { if($response['shipped'] || ($response['app'] === 'core')) {
if($response['response']->succeeded()) { if($response['response']->succeeded()) {
$shipped['succeeded'][$response['app']] = $response['response']; $shipped['succeeded'][$response['app']] = $response;
} else { } else {
$shipped['failed'][$response['app']] = $response['response']; $shipped['failed'][$response['app']] = $response;
} }
} else { } else {
if($response['response']->succeeded()) { if($response['response']->succeeded()) {
$thirdparty['succeeded'][$response['app']] = $response['response']; $thirdparty['succeeded'][$response['app']] = $response;
} else { } else {
$thirdparty['failed'][$response['app']] = $response['response']; $thirdparty['failed'][$response['app']] = $response;
} }
} }
} }
@ -177,10 +180,10 @@ class OC_API {
$data = array(); $data = array();
foreach($responses as $app => $response) { foreach($responses as $app => $response) {
if(OC_App::isShipped($app)) { if($response['shipped']) {
$data = array_merge_recursive($response->getData(), $data); $data = array_merge_recursive($response['response']->getData(), $data);
} else { } else {
$data = array_merge_recursive($data, $response->getData()); $data = array_merge_recursive($data, $response['response']->getData());
} }
} }
$result = new OC_OCS_Result($data, 100); $result = new OC_OCS_Result($data, 100);