diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2017-08-29 10:48:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 10:48:30 +0200 |
| commit | 1f7ea1f295ec2158667a85419c66cf1c1065a580 (patch) | |
| tree | c79343f1dff928403b66f894c7cda9af2454be5c | |
| parent | a6ea872b1ff2747473127c00cf5d703d1e4d758e (diff) | |
| parent | 9128786d099fefb61943c8fa4243e5aea60ba534 (diff) | |
| download | nextcloud-server-1f7ea1f295ec2158667a85419c66cf1c1065a580.tar.gz nextcloud-server-1f7ea1f295ec2158667a85419c66cf1c1065a580.zip | |
Merge pull request #6284 from nextcloud/add-new-propfind-stable12
add propfind to detect encryption status
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/FilesPlugin.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index efc9a42e5f5..40b39745f27 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php @@ -66,6 +66,7 @@ class FilesPlugin extends ServerPlugin { const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint'; const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview'; const MOUNT_TYPE_PROPERTYNAME = '{http://nextcloud.org/ns}mount-type'; + const IS_ENCRYPTED_PROPERTYNAME = '{http://nextcloud.org/ns}is-encrypted'; /** * Reference to main server object @@ -146,7 +147,6 @@ class FilesPlugin extends ServerPlugin { * @return void */ public function initialize(\Sabre\DAV\Server $server) { - $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc'; $server->xml->namespaceMap[self::NS_NEXTCLOUD] = 'nc'; $server->protectedProperties[] = self::FILEID_PROPERTYNAME; @@ -161,6 +161,7 @@ class FilesPlugin extends ServerPlugin { $server->protectedProperties[] = self::DATA_FINGERPRINT_PROPERTYNAME; $server->protectedProperties[] = self::HAS_PREVIEW_PROPERTYNAME; $server->protectedProperties[] = self::MOUNT_TYPE_PROPERTYNAME; + $server->protectedProperties[] = self::IS_ENCRYPTED_PROPERTYNAME; // normally these cannot be changed (RFC4918), but we want them modifiable through PROPPATCH $allowedProperties = ['{DAV:}getetag']; @@ -343,6 +344,11 @@ class FilesPlugin extends ServerPlugin { } }); + $propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function() use ($node) { + $result = $node->getFileInfo()->isEncrypted() ? '1' : '0'; + return $result; + }); + $propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) { return json_encode($this->previewManager->isAvailable($node->getFileInfo())); }); |