summaryrefslogtreecommitdiffstats
path: root/lib/api.php
diff options
context:
space:
mode:
authorTom Needham <tom@owncloud.com>2013-02-10 12:44:59 +0100
committerTom Needham <tom@owncloud.com>2013-02-10 12:44:59 +0100
commit28498e1af4beb018a83123145459ccf5365c54ef (patch)
tree7ad010137a97a4cbc45180e934e461025c58addf /lib/api.php
parente63c4e3ea8478a128bad758d90e256a04f19ddb6 (diff)
downloadnextcloud-server-28498e1af4beb018a83123145459ccf5365c54ef.tar.gz
nextcloud-server-28498e1af4beb018a83123145459ccf5365c54ef.zip
Code style and remove OAuth code
Diffstat (limited to 'lib/api.php')
-rw-r--r--lib/api.php14
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/api.php b/lib/api.php
index 8fa4d764abf..5f2e83c9ce9 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -33,6 +33,7 @@ class OC_API {
const USER_AUTH = 1;
const SUBADMIN_AUTH = 2;
const ADMIN_AUTH = 3;
+
/**
* API Response Codes
*/
@@ -40,15 +41,6 @@ class OC_API {
const RESPOND_SERVER_ERROR = 996;
const RESPOND_NOT_FOUND = 998;
const RESPOND_UNKNOWN_ERROR = 999;
-
- private static $server;
-
- /**
- * initialises the OAuth store and server
- */
- private static function init() {
- self::$server = new OC_OAuth_Server(new OC_OAuth_Store());
- }
/**
* api actions
@@ -156,9 +148,9 @@ class OC_API {
}
}
// Remove any error responses if there is one shipped response that succeeded
- if(!empty($shipped['succeeded'])){
+ if(!empty($shipped['succeeded'])) {
$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']);
- } else if(!empty($shipped['failed'])){
+ } else if(!empty($shipped['failed'])) {
// Which shipped response do we use if they all failed?
// They may have failed for different reasons (different status codes)
// Which reponse code should we return?