diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php index b011a050a5c695e89cb08007b6e6f69d1e588c81..ff5a6cc8b4b1dc260d79b9921a22351f8fbe62de 100644 --- a/lib/private/connector/sabre/filesplugin.php +++ b/lib/private/connector/sabre/filesplugin.php @@ -39,7 +39,7 @@ class OC_Connector_Sabre_FilesPlugin extends \Sabre\DAV\ServerPlugin $server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}id'; $server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}permissions'; $server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}size'; - $server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}dDU'; + $server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}downloadURL'; $this->server = $server; $this->server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties')); @@ -85,7 +85,7 @@ class OC_Connector_Sabre_FilesPlugin extends \Sabre\DAV\ServerPlugin /** @var $node OC_Connector_Sabre_File */ $directDownloadUrl = $node->getDirectDownload(); if (isset($directDownloadUrl['url'])) { - $directDownloadUrlPropertyName = '{' . self::NS_OWNCLOUD . '}dDU'; + $directDownloadUrlPropertyName = '{' . self::NS_OWNCLOUD . '}downloadURL'; $returnedProperties[200][$directDownloadUrlPropertyName] = $directDownloadUrl['url']; } } diff --git a/lib/private/files/storage/wrapper/wrapper.php b/lib/private/files/storage/wrapper/wrapper.php index d899c88363f20bd387cd171903b3b6aa48d55041..ea9de2873611bb582e20905de227e28327492d27 100644 --- a/lib/private/files/storage/wrapper/wrapper.php +++ b/lib/private/files/storage/wrapper/wrapper.php @@ -465,4 +465,16 @@ class Wrapper implements \OC\Files\Storage\Storage { public function __call($method, $args) { return call_user_func_array(array($this->storage, $method), $args); } + + /** + * A custom storage implementation can return an url for direct download of a give file. + * + * For now the returned array can hold the parameter url - in future more attributes might follow. + * + * @param string $path + * @return array + */ + public function getDirectDownload($path) { + return $this->storage->getDirectDownload($path); + } }