diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2022-07-13 07:33:22 +0000 |
|---|---|---|
| committer | David Siegfried <david.siegfried@uni-vechta.de> | 2022-07-13 07:33:22 +0000 |
| commit | 0aac35db01e545a84ac1b00946839af72fdf85ba (patch) | |
| tree | f10dd8f137b0c8a64d0677aa7c00f5722f6c5641 /app/routes/FileSystem.php | |
| parent | cea74f152c0211c157413a952af7c41c869e617e (diff) | |
fix code for restapi routes, fixes #1303
Closes #1303 and #1302
Merge request studip/studip!801
Diffstat (limited to 'app/routes/FileSystem.php')
| -rw-r--r-- | app/routes/FileSystem.php | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/app/routes/FileSystem.php b/app/routes/FileSystem.php index 591acfd..54e2851 100644 --- a/app/routes/FileSystem.php +++ b/app/routes/FileSystem.php @@ -116,17 +116,17 @@ class FileSystem extends \RESTAPI\RouteMap */ public function copyFileRef($file_ref_id, $destination_folder_id) { - $result = \FileManager::copyFileRef( - $this->requireFileRef($file_ref_id), + $result = \FileManager::copyFile( + $this->requireFileRef($file_ref_id)->getFileType(), $this->requireFolder($destination_folder_id)->getTypedFolder(), \User::findCurrent() ); - if (!$result instanceof \FileRef) { + if (!($result instanceof \FileType)) { $this->error(500, 'Error while copying a file reference: ' . implode(' ', $result)); } - return $this->filerefToJSON($result); + return $this->filerefToJSON($result->getFileRef()); } /** @@ -136,17 +136,17 @@ class FileSystem extends \RESTAPI\RouteMap */ public function moveFileRef($file_ref_id, $destination_folder_id) { - $result = \FileManager::moveFileRef( - $this->requireFileRef($file_ref_id), + $result = \FileManager::moveFile( + $this->requireFileRef($file_ref_id)->getFileType(), $this->requireFolder($destination_folder_id)->getTypedFolder(), \User::findCurrent() ); - if (!$result instanceof \FileRef) { + if (!($result instanceof \FileType)) { $this->error(500, 'Error while moving a file reference: ' . implode(' ', $result)); } - return $this->filerefToJSON($result); + return $this->filerefToJSON($result->getFileRef()); } /** @@ -274,10 +274,10 @@ class FileSystem extends \RESTAPI\RouteMap $query = "folder_id = :folder_id ORDER BY name ASC"; $parameters[':folder_id'] = $folder->id; - if ($limit || $offset) { + if ($this->limit || $this->offset) { $query .= " LIMIT :limit OFFSET :offset"; - $parameters[':limit'] = $limit; - $parameters[':offset'] = $offset; + $parameters[':limit'] = $this->limit; + $parameters[':offset'] = $this->offset; } $file_refs = \FileRef::findAndMapBySql(function (\FileRef $ref) { @@ -467,7 +467,7 @@ class FileSystem extends \RESTAPI\RouteMap /** * Requires a valid user object. - * @return User object + * @return \User object */ private function requireUser() { @@ -477,7 +477,7 @@ class FileSystem extends \RESTAPI\RouteMap /** * Requires a valid file reference object * @param mixed $id_or_object Either a file reference id or object - * @return FileRef object + * @return \FileRef object */ private function requireFileRef($id_or_object) { @@ -512,7 +512,7 @@ class FileSystem extends \RESTAPI\RouteMap /** * Converts a file reference object to JSON. - * @param FileRef $ref File reference object + * @param \FileRef $ref File reference object * @param boolean $extended Extended output? (includes folder, owner and terms of use) * @return array representation for json encoding */ |