diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-08-30 10:55:57 +0300 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-08-30 10:58:12 +0300 |
| commit | 4f3b323fbace6afcf50b95073c2560c5b2a0b8f1 (patch) | |
| tree | 7efc9d584ff05f649c544d916597896c4ee3e518 /apps | |
| parent | 7f80dccbaccd90c0ec015a24e5e564d0a5f5d57c (diff) | |
Move dav utils functions to OCP\Files\DavUtil
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/BulkUpload/BulkUploadPlugin.php | 5 | ||||
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/Node.php | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/apps/dav/lib/BulkUpload/BulkUploadPlugin.php b/apps/dav/lib/BulkUpload/BulkUploadPlugin.php index b5400ec58d2..0d5cce88d0d 100644 --- a/apps/dav/lib/BulkUpload/BulkUploadPlugin.php +++ b/apps/dav/lib/BulkUpload/BulkUploadPlugin.php @@ -28,6 +28,7 @@ use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; +use OCP\Files\DavUtil; use OCP\Files\Folder; use OCP\AppFramework\Http; use OCA\DAV\Connector\Sabre\MtimeSanitizer; @@ -95,8 +96,8 @@ class BulkUploadPlugin extends ServerPlugin { $writtenFiles[$headers['x-file-path']] = [ "error" => false, "etag" => $node->getETag(), - "fileid" => \OCP\Util::getDavFileId($node->getId()), - "permissions" => \OCP\Util::getDavPermissions($node), + "fileid" => DavUtil::getDavFileId($node->getId()), + "permissions" => DavUtil::getDavPermissions($node), ]; } catch (\Exception $e) { $this->logger->error($e->getMessage(), ['path' => $headers['x-file-path']]); diff --git a/apps/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php index c4fc6282f84..5fb811ad1ab 100644 --- a/apps/dav/lib/Connector/Sabre/Node.php +++ b/apps/dav/lib/Connector/Sabre/Node.php @@ -38,9 +38,9 @@ namespace OCA\DAV\Connector\Sabre; use OC\Files\Mount\MoveableMount; use OC\Files\Node\File; use OC\Files\Node\Folder; -use OC\Files\Storage\Wrapper\Wrapper; use OC\Files\View; use OCA\DAV\Connector\Sabre\Exception\InvalidPath; +use OCP\Files\DavUtil; use OCP\Files\FileInfo; use OCP\Files\IRootFolder; use OCP\Files\StorageNotAvailableException; @@ -253,7 +253,7 @@ abstract class Node implements \Sabre\DAV\INode { */ public function getFileId() { if ($id = $this->info->getId()) { - return \OCP\Util::getDavFileId($id); + return DavUtil::getDavFileId($id); } return null; @@ -379,7 +379,7 @@ abstract class Node implements \Sabre\DAV\INode { * @return string */ public function getDavPermissions() { - return \OCP\Util::getDavPermissions($this->info); + return DavUtil::getDavPermissions($this->info); } public function getOwner() { |