]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix usage of deprecated private constants
authorJoas Schilling <nickvergessen@owncloud.com>
Sat, 18 Apr 2015 08:30:02 +0000 (10:30 +0200)
committerJoas Schilling <nickvergessen@owncloud.com>
Sat, 18 Apr 2015 08:30:02 +0000 (10:30 +0200)
14 files changed:
apps/files/appinfo/routes.php
apps/files_external/appinfo/routes.php
apps/files_sharing/appinfo/routes.php
apps/files_trashbin/appinfo/routes.php
apps/files_versions/appinfo/routes.php
apps/provisioning_api/appinfo/routes.php
apps/provisioning_api/lib/apps.php
apps/provisioning_api/lib/groups.php
apps/provisioning_api/lib/users.php
apps/provisioning_api/tests/appstest.php
apps/provisioning_api/tests/groupstest.php
apps/provisioning_api/tests/userstest.php
lib/private/api.php
ocs/routes.php

index b6506824a80a12cd78d64b23227d5ca768290bcc..08c9041062db6b0897facebfbc530bc966638cf7 100644 (file)
@@ -85,4 +85,4 @@ $this->create('download', 'download{file}')
        ->actionInclude('files/download.php');
        
 // Register with the capabilities API
-\OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', \OC_API::USER_AUTH);
+\OCP\API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', \OCP\API::USER_AUTH);
index 31f82087786529a07b7188db628f61fcf3e6f688..98eb2fcccbbb99cf737669f7f913e9bf3e3b489a 100644 (file)
@@ -61,7 +61,7 @@ $this->create('files_external_google', 'ajax/google.php')
 $this->create('files_external_list_applicable', '/applicable')
        ->actionInclude('files_external/ajax/applicable.php');
 
-\OC_API::register('get',
+\OCP\API::register('get',
                '/apps/files_external/api/v1/mounts',
                array('\OCA\Files\External\Api', 'getUserMounts'),
                'files_external');
index 16f8727a51004a9fecd60728127724391e67d19a..9ac3a1f731abceae93e9e6e3b459277668bc4e6b 100644 (file)
@@ -26,6 +26,7 @@
 namespace OCA\Files_Sharing\AppInfo;
 
 use OCA\Files_Sharing\Application;
+use OCP\API;
 
 $application = new Application();
 $application->registerRoutes($this, [
@@ -55,33 +56,33 @@ $this->create('sharing_external_test_remote', '/testremote')
 
 //TODO: SET: mail notification, waiting for PR #4689 to be accepted
 
-\OC_API::register('get',
+API::register('get',
                '/apps/files_sharing/api/v1/shares',
                array('\OCA\Files_Sharing\API\Local', 'getAllShares'),
                'files_sharing');
 
-\OC_API::register('post',
+API::register('post',
                '/apps/files_sharing/api/v1/shares',
                array('\OCA\Files_Sharing\API\Local', 'createShare'),
                'files_sharing');
 
-\OC_API::register('get',
+API::register('get',
                '/apps/files_sharing/api/v1/shares/{id}',
                array('\OCA\Files_Sharing\API\Local', 'getShare'),
                'files_sharing');
 
-\OC_API::register('put',
+API::register('put',
                '/apps/files_sharing/api/v1/shares/{id}',
                array('\OCA\Files_Sharing\API\Local', 'updateShare'),
                'files_sharing');
 
-\OC_API::register('delete',
+API::register('delete',
                '/apps/files_sharing/api/v1/shares/{id}',
                array('\OCA\Files_Sharing\API\Local', 'deleteShare'),
                'files_sharing');
 
 // Register with the capabilities API
-\OC_API::register('get',
+API::register('get',
                '/cloud/capabilities',
                array('OCA\Files_Sharing\Capabilities', 'getCapabilities'),
-               'files_sharing', \OC_API::USER_AUTH);
+               'files_sharing', API::USER_AUTH);
index 05b082002a58bee4cf3f77b6e268f22b41ac0842..526ad1d4e354d12248e2616948eac696a3ae7b2a 100644 (file)
@@ -34,4 +34,4 @@ $this->create('files_trashbin_ajax_undelete', 'ajax/undelete.php')
 
 
 // Register with the capabilities API
-\OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Trashbin\Capabilities', 'getCapabilities'), 'files_trashbin', \OC_API::USER_AUTH);
+\OCP\API::register('get', '/cloud/capabilities', array('OCA\Files_Trashbin\Capabilities', 'getCapabilities'), 'files_trashbin', \OCP\API::USER_AUTH);
index 9a9bd5bd6559a2131c2f7fb9c9524a7f9859f14c..0ea37d3b1b1403eba6cfd65e2cbe44a38486af4f 100644 (file)
@@ -38,4 +38,4 @@ $this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php')
        ->actionInclude('files_versions/ajax/rollbackVersion.php');
 
 // Register with the capabilities API
-OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH);
+\OCP\API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', \OCP\API::USER_AUTH);
index 756822bc7e1936983700472ffd3a5e1c9fe63bca..87f073f82b00c36afd000d7ebe15698a2526353a 100644 (file)
  */
 
 // Users
-OCP\API::register('get', '/cloud/users', array('OCA\Provisioning_API\Users', 'getUsers'), 'provisioning_api', OC_API::ADMIN_AUTH);
-OCP\API::register('post', '/cloud/users', array('OCA\Provisioning_API\Users', 'addUser'), 'provisioning_api', OC_API::ADMIN_AUTH);
-OCP\API::register('get', '/cloud/users/{userid}', array('OCA\Provisioning_API\Users', 'getUser'), 'provisioning_api', OC_API::USER_AUTH);
-OCP\API::register('put', '/cloud/users/{userid}', array('OCA\Provisioning_API\Users', 'editUser'), 'provisioning_api', OC_API::USER_AUTH);
-OCP\API::register('delete', '/cloud/users/{userid}', array('OCA\Provisioning_API\Users', 'deleteUser'), 'provisioning_api', OC_API::SUBADMIN_AUTH);
-OCP\API::register('get', '/cloud/users/{userid}/groups', array('OCA\Provisioning_API\Users', 'getUsersGroups'), 'provisioning_api', OC_API::USER_AUTH);
-OCP\API::register('post', '/cloud/users/{userid}/groups', array('OCA\Provisioning_API\Users', 'addToGroup'), 'provisioning_api', OC_API::SUBADMIN_AUTH);
-OCP\API::register('delete', '/cloud/users/{userid}/groups', array('OCA\Provisioning_API\Users', 'removeFromGroup'), 'provisioning_api', OC_API::SUBADMIN_AUTH);
-OCP\API::register('post', '/cloud/users/{userid}/subadmins', array('OCA\Provisioning_API\Users', 'addSubAdmin'), 'provisioning_api', OC_API::ADMIN_AUTH);
-OCP\API::register('delete', '/cloud/users/{userid}/subadmins', array('OCA\Provisioning_API\Users', 'removeSubAdmin'), 'provisioning_api', OC_API::ADMIN_AUTH);
-OCP\API::register('get', '/cloud/users/{userid}/subadmins', array('OCA\Provisioning_API\Users', 'getUserSubAdminGroups'), 'provisioning_api', OC_API::ADMIN_AUTH);
+use OCP\API;
+
+API::register('get', '/cloud/users', array('OCA\Provisioning_API\Users', 'getUsers'), 'provisioning_api', API::ADMIN_AUTH);
+API::register('post', '/cloud/users', array('OCA\Provisioning_API\Users', 'addUser'), 'provisioning_api', API::ADMIN_AUTH);
+API::register('get', '/cloud/users/{userid}', array('OCA\Provisioning_API\Users', 'getUser'), 'provisioning_api', API::USER_AUTH);
+API::register('put', '/cloud/users/{userid}', array('OCA\Provisioning_API\Users', 'editUser'), 'provisioning_api', API::USER_AUTH);
+API::register('delete', '/cloud/users/{userid}', array('OCA\Provisioning_API\Users', 'deleteUser'), 'provisioning_api', API::SUBADMIN_AUTH);
+API::register('get', '/cloud/users/{userid}/groups', array('OCA\Provisioning_API\Users', 'getUsersGroups'), 'provisioning_api', API::USER_AUTH);
+API::register('post', '/cloud/users/{userid}/groups', array('OCA\Provisioning_API\Users', 'addToGroup'), 'provisioning_api', API::SUBADMIN_AUTH);
+API::register('delete', '/cloud/users/{userid}/groups', array('OCA\Provisioning_API\Users', 'removeFromGroup'), 'provisioning_api', API::SUBADMIN_AUTH);
+API::register('post', '/cloud/users/{userid}/subadmins', array('OCA\Provisioning_API\Users', 'addSubAdmin'), 'provisioning_api', API::ADMIN_AUTH);
+API::register('delete', '/cloud/users/{userid}/subadmins', array('OCA\Provisioning_API\Users', 'removeSubAdmin'), 'provisioning_api', API::ADMIN_AUTH);
+API::register('get', '/cloud/users/{userid}/subadmins', array('OCA\Provisioning_API\Users', 'getUserSubAdminGroups'), 'provisioning_api', API::ADMIN_AUTH);
 
 // Groups
-OCP\API::register('get', '/cloud/groups', array('OCA\Provisioning_API\Groups', 'getGroups'), 'provisioning_api', OC_API::SUBADMIN_AUTH);
-OCP\API::register('post', '/cloud/groups', array('OCA\Provisioning_API\Groups', 'addGroup'), 'provisioning_api', OC_API::SUBADMIN_AUTH);
-OCP\API::register('get', '/cloud/groups/{groupid}', array('OCA\Provisioning_API\Groups', 'getGroup'), 'provisioning_api', OC_API::SUBADMIN_AUTH);
-OCP\API::register('delete', '/cloud/groups/{groupid}', array('OCA\Provisioning_API\Groups', 'deleteGroup'), 'provisioning_api', OC_API::ADMIN_AUTH);
-OCP\API::register('get', '/cloud/groups/{groupid}/subadmins', array('OCA\Provisioning_API\Groups', 'getSubAdminsOfGroup'), 'provisioning_api', OC_API::ADMIN_AUTH);
+API::register('get', '/cloud/groups', array('OCA\Provisioning_API\Groups', 'getGroups'), 'provisioning_api', API::SUBADMIN_AUTH);
+API::register('post', '/cloud/groups', array('OCA\Provisioning_API\Groups', 'addGroup'), 'provisioning_api', API::SUBADMIN_AUTH);
+API::register('get', '/cloud/groups/{groupid}', array('OCA\Provisioning_API\Groups', 'getGroup'), 'provisioning_api', API::SUBADMIN_AUTH);
+API::register('delete', '/cloud/groups/{groupid}', array('OCA\Provisioning_API\Groups', 'deleteGroup'), 'provisioning_api', API::ADMIN_AUTH);
+API::register('get', '/cloud/groups/{groupid}/subadmins', array('OCA\Provisioning_API\Groups', 'getSubAdminsOfGroup'), 'provisioning_api', API::ADMIN_AUTH);
 
 // Apps
-OCP\API::register('get', '/cloud/apps', array('OCA\Provisioning_API\Apps', 'getApps'), 'provisioning_api', OC_API::ADMIN_AUTH);
-OCP\API::register('get', '/cloud/apps/{appid}', array('OCA\Provisioning_API\Apps', 'getAppInfo'), 'provisioning_api', OC_API::ADMIN_AUTH);
-OCP\API::register('post', '/cloud/apps/{appid}', array('OCA\Provisioning_API\Apps', 'enable'), 'provisioning_api', OC_API::ADMIN_AUTH);
-OCP\API::register('delete', '/cloud/apps/{appid}', array('OCA\Provisioning_API\Apps', 'disable'), 'provisioning_api', OC_API::ADMIN_AUTH);
+API::register('get', '/cloud/apps', array('OCA\Provisioning_API\Apps', 'getApps'), 'provisioning_api', API::ADMIN_AUTH);
+API::register('get', '/cloud/apps/{appid}', array('OCA\Provisioning_API\Apps', 'getAppInfo'), 'provisioning_api', API::ADMIN_AUTH);
+API::register('post', '/cloud/apps/{appid}', array('OCA\Provisioning_API\Apps', 'enable'), 'provisioning_api', API::ADMIN_AUTH);
+API::register('delete', '/cloud/apps/{appid}', array('OCA\Provisioning_API\Apps', 'disable'), 'provisioning_api', API::ADMIN_AUTH);
index c1abb772e41d0f96d38aab533eac34c07db688d8..2bafd06a084eafa5908749a6cce408c89d39154f 100644 (file)
@@ -60,7 +60,7 @@ class Apps {
                if(!is_null($info)) {
                        return new OC_OCS_Result(OC_App::getAppInfo($app));
                } else {
-                       return new OC_OCS_Result(null, \OC_API::RESPOND_NOT_FOUND, 'The request app was not found');
+                       return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The request app was not found');
                }
        }
 
index 4a5a69216c4f946f694587fc0ddfc03791490e20..cd156110635026a07231ce248ddf1fddfc27ac8c 100644 (file)
@@ -44,14 +44,14 @@ class Groups{
        public static function getGroup($parameters){
                // Check the group exists
                if(!OC_Group::groupExists($parameters['groupid'])){
-                       return new OC_OCS_Result(null, \OC_API::RESPOND_NOT_FOUND, 'The requested group could not be found');
+                       return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested group could not be found');
                }
                // Check subadmin has access to this group
                if(\OC_User::isAdminUser(\OC_User::getUser())
                        || in_array($parameters['groupid'], \OC_SubAdmin::getSubAdminsGroups(\OC_User::getUser()))){
                        return new OC_OCS_Result(array('users' => OC_Group::usersInGroup($parameters['groupid'])));
                } else {
-                       return new OC_OCS_Result(null, \OC_API::RESPOND_UNAUTHORISED, 'User does not have access to specified group');
+                       return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED, 'User does not have access to specified group');
                }
        }
 
index 6169ea16f9cf257a0b9ec351dad7e7884ee484d2..505a141c032b2184ac8125a437c18ffbc0e01dca 100644 (file)
@@ -67,7 +67,7 @@ class Users {
                if(OC_User::isAdminUser(OC_User::getUser()) || OC_SubAdmin::isUserAccessible(OC_User::getUser(), $userId)) {
                        // Check they exist
                        if(!OC_User::userExists($userId)) {
-                               return new OC_OCS_Result(null, \OC_API::RESPOND_NOT_FOUND, 'The requested user could not be found');
+                               return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested user could not be found');
                        }
                        // Show all
                        $return = array(
@@ -80,7 +80,7 @@ class Users {
                } else {
                        // Check they are looking up themselves
                        if(OC_User::getUser() != $userId) {
-                               return new OC_OCS_Result(null, \OC_API::RESPOND_UNAUTHORISED);
+                               return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
                        }
                        // Return some additional information compared to the core route
                        $return = array(
@@ -226,7 +226,7 @@ class Users {
                // Check they're an admin
                if(!OC_Group::inGroup(OC_User::getUser(), 'admin')){
                        // This user doesn't have rights to add a user to this group
-                       return new OC_OCS_Result(null, \OC_API::RESPOND_UNAUTHORISED);
+                       return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
                }
                // Check if the group exists
                if(!OC_Group::groupExists($group)){
index b2b5748ea27f09aba9bbbcb92e5baedb5cf82b0e..140dd287a0e1112d36ca467d156d10cbdc3386f3 100644 (file)
@@ -36,7 +36,7 @@ class AppsTest extends TestCase {
                $result = \OCA\provisioning_API\Apps::getAppInfo(array('appid' => 'not_provisioning_api'));
                $this->assertInstanceOf('OC_OCS_Result', $result);
                $this->assertFalse($result->succeeded());
-               $this->assertEquals(\OC_API::RESPOND_NOT_FOUND, $result->getStatusCode());
+               $this->assertEquals(\OCP\API::RESPOND_NOT_FOUND, $result->getStatusCode());
 
        }
 
index 7c5343af46d9cec7e4425b75357e59c65d684c03..94bde52c392b375fc3193ca7c44b8ef1d1bfdf9f 100644 (file)
@@ -39,7 +39,7 @@ class GroupsTest extends TestCase {
 
                $this->assertInstanceOf('OC_OCS_Result', $result);
                $this->assertFalse($result->succeeded());
-               $this->assertEquals(\OC_API::RESPOND_UNAUTHORISED, $result->getStatusCode());
+               $this->assertEquals(\OCP\API::RESPOND_UNAUTHORISED, $result->getStatusCode());
 
        }
 
@@ -92,7 +92,7 @@ class GroupsTest extends TestCase {
 
                $this->assertInstanceOf('OC_OCS_Result', $result);
                $this->assertFalse($result->succeeded());
-               $this->assertEquals(\OC_API::RESPOND_UNAUTHORISED, $result->getStatusCode());
+               $this->assertEquals(\OCP\API::RESPOND_UNAUTHORISED, $result->getStatusCode());
 
        }
 
index f06f853ee1fce63f967be1e47a6feffe97772c5a..b7e83a3c4fe49b33b18ae72f2285ba24b8500b5a 100644 (file)
@@ -101,7 +101,7 @@ class UsersTest extends TestCase {
                $result = \OCA\provisioning_API\Users::getUser($params);
                $this->assertInstanceOf('OC_OCS_Result', $result);
                $this->assertFalse($result->succeeded());
-               $this->assertEquals(\OC_API::RESPOND_NOT_FOUND, $result->getStatusCode());
+               $this->assertEquals(\OCP\API::RESPOND_NOT_FOUND, $result->getStatusCode());
 
        }
 
index f8fd4fbb5aaf56cb07a8b97a5964f4e8caed4695..dd50162f03e73a436426d488979ce113beba912b 100644 (file)
@@ -188,7 +188,7 @@ class OC_API {
                        // Which shipped response do we use if they all failed?
                        // They may have failed for different reasons (different status codes)
                        // Which response code should we return?
-                       // Maybe any that are not OC_API::RESPOND_SERVER_ERROR
+                       // Maybe any that are not \OCP\API::RESPOND_SERVER_ERROR
                        // Merge failed responses if more than one
                        $data = array();
                        foreach($shipped['failed'] as $failure) {
@@ -400,7 +400,7 @@ class OC_API {
         * Based on the requested format the response content type is set
         */
        public static function setContentType() {
-               $format = \OC_API::requestedFormat();
+               $format = self::requestedFormat();
                if ($format === 'xml') {
                        header('Content-type: text/xml; charset=UTF-8');
                        return;
index 2a8fe5dc2afc129a05a1029df546123b94b6260b..751a16d538e35eebed2f062c6fa29671d83aa732 100644 (file)
  *
  */
 
+use OCP\API;
+
 // Config
-OC_API::register(
+API::register(
        'get',
        '/config',
        array('OC_OCS_Config', 'apiConfig'),
        'core',
-       OC_API::GUEST_AUTH
+       API::GUEST_AUTH
        );
 // Person
-OC_API::register(
+API::register(
        'post',
        '/person/check',
        array('OC_OCS_Person', 'check'),
        'core',
-       OC_API::GUEST_AUTH
+       API::GUEST_AUTH
        );
 // Privatedata
-OC_API::register(
+API::register(
        'get',
        '/privatedata/getattribute',
        array('OC_OCS_Privatedata', 'get'),
        'core',
-       OC_API::USER_AUTH,
+       API::USER_AUTH,
        array('app' => '', 'key' => '')
        );
-OC_API::register(
+API::register(
        'get',
        '/privatedata/getattribute/{app}',
        array('OC_OCS_Privatedata', 'get'),
        'core',
-       OC_API::USER_AUTH,
+       API::USER_AUTH,
        array('key' => '')
        );
-OC_API::register(
+API::register(
        'get',
        '/privatedata/getattribute/{app}/{key}',
        array('OC_OCS_Privatedata', 'get'),
        'core',
-       OC_API::USER_AUTH
+       API::USER_AUTH
        );
-OC_API::register(
+API::register(
        'post',
        '/privatedata/setattribute/{app}/{key}',
        array('OC_OCS_Privatedata', 'set'),
        'core',
-       OC_API::USER_AUTH
+       API::USER_AUTH
        );
-OC_API::register(
+API::register(
        'post',
        '/privatedata/deleteattribute/{app}/{key}',
        array('OC_OCS_Privatedata', 'delete'),
        'core',
-       OC_API::USER_AUTH
+       API::USER_AUTH
        );
 // cloud
-OC_API::register(
+API::register(
        'get',
        '/cloud/capabilities',
        array('OC_OCS_Cloud', 'getCapabilities'),
        'core',
-       OC_API::USER_AUTH
+       API::USER_AUTH
        );
-OC_API::register(
+API::register(
        'get',
        '/cloud/users/{userid}',
        array('OC_OCS_Cloud', 'getUser'),
        'core',
-       OC_API::USER_AUTH
+       API::USER_AUTH
 );
-OC_API::register(
+API::register(
        'get',
        '/cloud/user',
        array('OC_OCS_Cloud', 'getCurrentUser'),
        'core',
-       OC_API::USER_AUTH
+       API::USER_AUTH
 );
 
 // Server-to-Server Sharing
 $s2s = new \OCA\Files_Sharing\API\Server2Server();
-OC_API::register('post',
+API::register('post',
                '/cloud/shares',
                array($s2s, 'createShare'),
                'files_sharing',
-               OC_API::GUEST_AUTH
+               API::GUEST_AUTH
 );
 
-OC_API::register('post',
+API::register('post',
                '/cloud/shares/{id}/accept',
                array($s2s, 'acceptShare'),
                'files_sharing',
-               OC_API::GUEST_AUTH
+               API::GUEST_AUTH
 );
 
-OC_API::register('post',
+API::register('post',
                '/cloud/shares/{id}/decline',
                array($s2s, 'declineShare'),
                'files_sharing',
-               OC_API::GUEST_AUTH
+               API::GUEST_AUTH
 );
 
-OC_API::register('post',
+API::register('post',
                '/cloud/shares/{id}/unshare',
                array($s2s, 'unshare'),
                'files_sharing',
-               OC_API::GUEST_AUTH
+               API::GUEST_AUTH
 );