diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-24 15:31:52 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-12-04 13:18:13 +0100 |
| commit | 698ecbf308d1eae950138bff9edbb0d542c391d0 (patch) | |
| tree | 3f6ab525053f56c01f2fcef4792a9756f882ab7d /apps/files_sharing/appinfo | |
| parent | f0e6876f2ec8ec4576ca0ce8bbfee5bd8082dc1f (diff) | |
| download | nextcloud-server-698ecbf308d1eae950138bff9edbb0d542c391d0.tar.gz nextcloud-server-698ecbf308d1eae950138bff9edbb0d542c391d0.zip | |
OCS API for server-to-server sharing
Diffstat (limited to 'apps/files_sharing/appinfo')
| -rw-r--r-- | apps/files_sharing/appinfo/app.php | 5 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/database.xml | 15 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/routes.php | 10 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/version | 2 |
4 files changed, 24 insertions, 8 deletions
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index a01f8d98c7d..329afa07519 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -8,7 +8,6 @@ OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'files_sharing/lib/cache.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'files_sharing/lib/permissions.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php'; -OC::$CLASSPATH['OCA\Files\Share\Api'] = 'files_sharing/lib/api.php'; OC::$CLASSPATH['OCA\Files\Share\Maintainer'] = 'files_sharing/lib/maintainer.php'; OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php'; @@ -28,6 +27,10 @@ OCP\Util::addScript('files_sharing', 'external'); OC_FileProxy::register(new OCA\Files\Share\Proxy()); +\OC::$server->getActivityManager()->registerExtension(function() { + return new \OCA\Files_Sharing\Activity(); +}); + $config = \OC::$server->getConfig(); if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') { diff --git a/apps/files_sharing/appinfo/database.xml b/apps/files_sharing/appinfo/database.xml index 73d64c527b7..38718ab0773 100644 --- a/apps/files_sharing/appinfo/database.xml +++ b/apps/files_sharing/appinfo/database.xml @@ -23,6 +23,12 @@ <comments>Url of the remove owncloud instance</comments> </field> <field> + <name>remote_id</name> + <type>integer</type> + <notnull>true</notnull> + <length>4</length> + </field> + <field> <name>share_token</name> <type>text</type> <notnull>true</notnull> @@ -32,7 +38,7 @@ <field> <name>password</name> <type>text</type> - <notnull>true</notnull> + <notnull>false</notnull> <length>64</length> <comments>Optional password for the public share</comments> </field> @@ -71,6 +77,13 @@ <length>32</length> <comments>md5 hash of the mountpoint</comments> </field> + <field> + <name>accepted</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>4</length> + </field> <index> <name>sh_external_user</name> <field> diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php index 68f33d94995..41bdf554fc5 100644 --- a/apps/files_sharing/appinfo/routes.php +++ b/apps/files_sharing/appinfo/routes.php @@ -22,25 +22,25 @@ $this->create('sharing_external_test_remote', '/testremote') OC_API::register('get', '/apps/files_sharing/api/v1/shares', - array('\OCA\Files\Share\Api', 'getAllShares'), + array('\OCA\Files_Sharing\API\Local', 'getAllShares'), 'files_sharing'); OC_API::register('post', '/apps/files_sharing/api/v1/shares', - array('\OCA\Files\Share\Api', 'createShare'), + array('\OCA\Files_Sharing\API\Local', 'createShare'), 'files_sharing'); OC_API::register('get', '/apps/files_sharing/api/v1/shares/{id}', - array('\OCA\Files\Share\Api', 'getShare'), + array('\OCA\Files_Sharing\API\Local', 'getShare'), 'files_sharing'); OC_API::register('put', '/apps/files_sharing/api/v1/shares/{id}', - array('\OCA\Files\Share\Api', 'updateShare'), + array('\OCA\Files_Sharing\API\Local', 'updateShare'), 'files_sharing'); OC_API::register('delete', '/apps/files_sharing/api/v1/shares/{id}', - array('\OCA\Files\Share\Api', 'deleteShare'), + array('\OCA\Files_Sharing\API\Local', 'deleteShare'), 'files_sharing'); diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version index be14282b7ff..7d8568351b4 100644 --- a/apps/files_sharing/appinfo/version +++ b/apps/files_sharing/appinfo/version @@ -1 +1 @@ -0.5.3 +0.5.4 |