diff options
| author | Tom Needham <tom@owncloud.com> | 2013-02-09 11:56:30 +0000 |
|---|---|---|
| committer | Tom Needham <tom@owncloud.com> | 2013-02-09 11:56:30 +0000 |
| commit | ab8777a623099f04636e33e3e406cfd685cf4867 (patch) | |
| tree | 7bd66f664cb08e86f2fb4133564ba83c5a5aafb5 /ocs | |
| parent | 934735043bd130db1dc854f444a076e6e8ef89d3 (diff) | |
| parent | 5102596e6d461313cd10f64d033107ce1218a854 (diff) | |
| download | nextcloud-server-ab8777a623099f04636e33e3e406cfd685cf4867.tar.gz nextcloud-server-ab8777a623099f04636e33e3e406cfd685cf4867.zip | |
Merge branch 'ocs_capabilities' into ocs_multiple_methods
Diffstat (limited to 'ocs')
| -rw-r--r-- | ocs/providers.php | 2 | ||||
| -rw-r--r-- | ocs/routes.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ocs/providers.php b/ocs/providers.php index 0c7cbaeff08..bf94b85dcfb 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -23,7 +23,7 @@ require_once '../lib/base.php'; -$url=OCP\Util::getServerProtocol().'://'.substr(OCP\Util::getServerHost().$_SERVER['REQUEST_URI'], 0, -17).'ocs/v1.php/'; +$url=OCP\Util::getServerProtocol().'://'.substr(OCP\Util::getServerHost().OCP\Util::getRequestUri(), 0, -17).'ocs/v1.php/'; echo(' <providers> diff --git a/ocs/routes.php b/ocs/routes.php index d6ee589df6f..5e4758fb705 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -17,4 +17,5 @@ OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Private OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH); OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs', OC_API::USER_AUTH); OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs', OC_API::USER_AUTH); - +// cloud +OC_API::register('get', '/cloud/capabilities', array('OC_OCS_Cloud', 'getCapabilities'), 'ocs', OC_API::USER_AUTH);
\ No newline at end of file |