nextcloud / server

apps/files/templates/appnavigation.php

Indentation +19 added lines, -19 removed lines

@@ -2,11 +2,11 @@ 
 <div class="hidden">
 	<ul class="with-icon" tabindex="0">
 		<?php
-			$pinned = 0;
-			foreach ($_['navigationItems'] as $item) {
-				$pinned = NavigationListElements($item, $l, $pinned);
-			}
-		?>
+            $pinned = 0;
+            foreach ($_['navigationItems'] as $item) {
+                $pinned = NavigationListElements($item, $l, $pinned);
+            }
+        ?>
 	</ul>
 </div>
 
@@ -23,7 +23,7 @@ 
  * @return int Returns the pinned value
  */
 function NavigationListElements($item, $l, $pinned) {
-	strpos($item['classes'] ?? '', 'pinned') !== false ? $pinned++ : ''; ?>
+    strpos($item['classes'] ?? '', 'pinned') !== false ? $pinned++ : ''; ?>
 	<li
 		data-id="<?php p($item['id']) ?>"
 		<?php if (isset($item['dir'])) { ?> data-dir="<?php p($item['dir']); ?>" <?php } ?>
@@ -31,8 +31,8 @@ 
 		<?php if (isset($item['expandedState'])) { ?> data-expandedstate="<?php p($item['expandedState']); ?>" <?php } ?>
 		class="nav-<?php p($item['id']) ?>
 		<?php if (isset($item['classes'])) {
-		p($item['classes']);
-	} ?>
+        p($item['classes']);
+    } ?>
 		<?php p($pinned === 1 ? 'first-pinned' : '') ?>
 		<?php if (isset($item['defaultExpandedState']) && $item['defaultExpandedState']) { ?> open<?php } ?>"
 		<?php if (isset($item['folderPosition'])) { ?> folderposition="<?php p($item['folderPosition']); ?>" <?php } ?>>
@@ -42,26 +42,26 @@ 
 
 
 		<?php
-		NavigationElementMenu($item);
-	if (isset($item['sublist'])) {
-		?>
+        NavigationElementMenu($item);
+    if (isset($item['sublist'])) {
+        ?>
 			<button class="collapse app-navigation-noclose" aria-expanded="<?= !empty($item['defaultExpandedState']) ? 'true' : 'false' ?>"
 				aria-label="<?php p($l->t('Toggle %1$s sublist', $item['name'])) ?>"
 				<?php if (sizeof($item['sublist']) == 0) { ?> style="display: none" <?php } ?>>
 			</button>
 			<ul id="sublist-<?php p($item['id']); ?>">
 				<?php
-				foreach ($item['sublist'] as $item) {
-					$pinned = NavigationListElements($item, $l, $pinned);
-				} ?>
+                foreach ($item['sublist'] as $item) {
+                    $pinned = NavigationListElements($item, $l, $pinned);
+                } ?>
 			</ul>
 		<?php
-	} ?>
+    } ?>
 	</li>
 
 
 	<?php
-	return $pinned;
+    return $pinned;
 }
 
 /**
@@ -72,8 +72,8 @@ 
  * @return void
  */
 function NavigationElementMenu($item) {
-	if (isset($item['menubuttons']) && $item['menubuttons'] === 'true') {
-		?>
+    if (isset($item['menubuttons']) && $item['menubuttons'] === 'true') {
+        ?>
 		<div id="dotmenu-<?php p($item['id']); ?>"
 			 class="app-navigation-entry-utils" <?php if (isset($item['enableMenuButton']) && $item['enableMenuButton'] === 0) { ?> style="display: none"<?php } ?>>
 			<ul>
@@ -89,5 +89,5 @@ 
 			</ul>
 		</div>
 	<?php
-	}
+    }
 }

apps/files/lib/Controller/ApiController.php

Indentation +381 added lines, -381 removed lines

@@ -64,386 +64,386 @@
  * @package OCA\Files\Controller
  */
 class ApiController extends Controller {
-	private TagService $tagService;
-	private IManager $shareManager;
-	private IPreview $previewManager;
-	private IUserSession $userSession;
-	private IConfig $config;
-	private Folder $userFolder;
-	private UserConfig $userConfig;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserSession $userSession
-	 * @param TagService $tagService
-	 * @param IPreview $previewManager
-	 * @param IManager $shareManager
-	 * @param IConfig $config
-	 * @param Folder $userFolder
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IUserSession $userSession,
-								TagService $tagService,
-								IPreview $previewManager,
-								IManager $shareManager,
-								IConfig $config,
-								Folder $userFolder,
-								UserConfig $userConfig) {
-		parent::__construct($appName, $request);
-		$this->userSession = $userSession;
-		$this->tagService = $tagService;
-		$this->previewManager = $previewManager;
-		$this->shareManager = $shareManager;
-		$this->config = $config;
-		$this->userFolder = $userFolder;
-		$this->userConfig = $userConfig;
-	}
-
-	/**
-	 * Gets a thumbnail of the specified file
-	 *
-	 * @since API version 1.0
-	 *
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @StrictCookieRequired
-	 *
-	 * @param int $x
-	 * @param int $y
-	 * @param string $file URL-encoded filename
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getThumbnail($x, $y, $file) {
-		if ($x < 1 || $y < 1) {
-			return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$file = $this->userFolder->get($file);
-			if ($file instanceof Folder) {
-				throw new NotFoundException();
-			}
-
-			/** @var File $file */
-			$preview = $this->previewManager->getPreview($file, $x, $y, true);
-
-			return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse(['message' => 'File not found.'], Http::STATUS_NOT_FOUND);
-		} catch (\Exception $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
-
-	/**
-	 * Updates the info of the specified file path
-	 * The passed tags are absolute, which means they will
-	 * replace the actual tag selection.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $path path
-	 * @param array|string $tags array of tags
-	 * @return DataResponse
-	 */
-	public function updateFileTags($path, $tags = null) {
-		$result = [];
-		// if tags specified or empty array, update tags
-		if (!is_null($tags)) {
-			try {
-				$this->tagService->updateFileTags($path, $tags);
-			} catch (\OCP\Files\NotFoundException $e) {
-				return new DataResponse([
-					'message' => $e->getMessage()
-				], Http::STATUS_NOT_FOUND);
-			} catch (\OCP\Files\StorageNotAvailableException $e) {
-				return new DataResponse([
-					'message' => $e->getMessage()
-				], Http::STATUS_SERVICE_UNAVAILABLE);
-			} catch (\Exception $e) {
-				return new DataResponse([
-					'message' => $e->getMessage()
-				], Http::STATUS_NOT_FOUND);
-			}
-			$result['tags'] = $tags;
-		}
-		return new DataResponse($result);
-	}
-
-	/**
-	 * @param \OCP\Files\Node[] $nodes
-	 * @return array
-	 */
-	private function formatNodes(array $nodes) {
-		$shareTypesForNodes = $this->getShareTypesForNodes($nodes);
-		return array_values(array_map(function (Node $node) use ($shareTypesForNodes) {
-			$shareTypes = $shareTypesForNodes[$node->getId()] ?? [];
-			$file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo());
-			$file['hasPreview'] = $this->previewManager->isAvailable($node);
-			$parts = explode('/', dirname($node->getPath()), 4);
-			if (isset($parts[3])) {
-				$file['path'] = '/' . $parts[3];
-			} else {
-				$file['path'] = '/';
-			}
-			if (!empty($shareTypes)) {
-				$file['shareTypes'] = $shareTypes;
-			}
-			return $file;
-		}, $nodes));
-	}
-
-	/**
-	 * Get the share types for each node
-	 *
-	 * @param \OCP\Files\Node[] $nodes
-	 * @return array<int, int[]> list of share types for each fileid
-	 */
-	private function getShareTypesForNodes(array $nodes): array {
-		$userId = $this->userSession->getUser()->getUID();
-		$requestedShareTypes = [
-			IShare::TYPE_USER,
-			IShare::TYPE_GROUP,
-			IShare::TYPE_LINK,
-			IShare::TYPE_REMOTE,
-			IShare::TYPE_EMAIL,
-			IShare::TYPE_ROOM,
-			IShare::TYPE_DECK,
-			IShare::TYPE_SCIENCEMESH,
-		];
-		$shareTypes = [];
-
-		$nodeIds = array_map(function (Node $node) {
-			return $node->getId();
-		}, $nodes);
-
-		foreach ($requestedShareTypes as $shareType) {
-			$nodesLeft = array_combine($nodeIds, array_fill(0, count($nodeIds), true));
-			$offset = 0;
-
-			// fetch shares until we've either found shares for all nodes or there are no more shares left
-			while (count($nodesLeft) > 0) {
-				$shares = $this->shareManager->getSharesBy($userId, $shareType, null, false, 100, $offset);
-				foreach ($shares as $share) {
-					$fileId = $share->getNodeId();
-					if (isset($nodesLeft[$fileId])) {
-						if (!isset($shareTypes[$fileId])) {
-							$shareTypes[$fileId] = [];
-						}
-						$shareTypes[$fileId][] = $shareType;
-						unset($nodesLeft[$fileId]);
-					}
-				}
-
-				if (count($shares) < 100) {
-					break;
-				} else {
-					$offset += count($shares);
-				}
-			}
-		}
-		return $shareTypes;
-	}
-
-	/**
-	 * Returns a list of recently modified files.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return DataResponse
-	 */
-	public function getRecentFiles() {
-		$nodes = $this->userFolder->getRecent(100);
-		$files = $this->formatNodes($nodes);
-		return new DataResponse(['files' => $files]);
-	}
-
-
-	/**
-	 * Returns the current logged-in user's storage stats.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param ?string $dir the directory to get the storage stats from
-	 * @return JSONResponse
-	 */
-	public function getStorageStats($dir = '/'): JSONResponse {
-		$storageInfo = \OC_Helper::getStorageInfo($dir ?: '/');
-		return new JSONResponse(['message' => 'ok', 'data' => $storageInfo]);
-	}
-
-	/**
-	 * Change the default sort mode
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $mode
-	 * @param string $direction
-	 * @return JSONResponse
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function updateFileSorting($mode, string $direction = 'asc', string $view = 'files'): JSONResponse {
-		$allowedDirection = ['asc', 'desc'];
-		if (!in_array($direction, $allowedDirection)) {
-			return  new JSONResponse(['message' => 'Invalid direction parameter'], Http::STATUS_UNPROCESSABLE_ENTITY);
-		}
-
-		$userId = $this->userSession->getUser()->getUID();
-
-		$sortingJson = $this->config->getUserValue($userId, 'files', 'files_sorting_configs', '{}');
-		$sortingConfig = json_decode($sortingJson, true) ?: [];
-		$sortingConfig[$view] = [
-			'mode' => $mode,
-			'direction' => $direction,
-		];
-
-		$this->config->setUserValue($userId, 'files', 'files_sorting_configs', json_encode($sortingConfig));
-		return new JSONResponse([
-			'message' => 'ok',
-			'data' => $sortingConfig,
-		]);
-	}
-
-	/**
-	 * Toggle default files user config
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $key
-	 * @param string|bool $value
-	 * @return JSONResponse
-	 */
-	public function setConfig(string $key, $value): JSONResponse {
-		try {
-			$this->userConfig->setConfig($key, (string)$value);
-		} catch (\InvalidArgumentException $e) {
-			return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
-		}
-
-		return new JSONResponse(['message' => 'ok', 'data' => ['key' => $key, 'value' => $value]]);
-	}
-
-
-	/**
-	 * Get the user config
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return JSONResponse
-	 */
-	public function getConfigs(): JSONResponse {
-		return new JSONResponse(['message' => 'ok', 'data' => $this->userConfig->getConfigs()]);
-	}
-
-	/**
-	 * Toggle default for showing/hiding hidden files
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param bool $value
-	 * @return Response
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function showHiddenFiles(bool $value): Response {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', $value ? '1' : '0');
-		return new Response();
-	}
-
-	/**
-	 * Toggle default for cropping preview images
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param bool $value
-	 * @return Response
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function cropImagePreviews(bool $value): Response {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'crop_image_previews', $value ? '1' : '0');
-		return new Response();
-	}
-
-	/**
-	 * Toggle default for files grid view
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param bool $show
-	 * @return Response
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function showGridView(bool $show): Response {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', $show ? '1' : '0');
-		return new Response();
-	}
-
-	/**
-	 * Get default settings for the grid view
-	 *
-	 * @NoAdminRequired
-	 */
-	public function getGridView() {
-		$status = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', '0') === '1';
-		return new JSONResponse(['gridview' => $status]);
-	}
-
-	/**
-	 * Toggle default for showing/hiding xxx folder
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param int $show
-	 * @param string $key the key of the folder
-	 *
-	 * @return Response
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function toggleShowFolder(int $show, string $key): Response {
-		if ($show !== 0 && $show !== 1) {
-			return new DataResponse([
-				'message' => 'Invalid show value. Only 0 and 1 are allowed.'
-			], Http::STATUS_BAD_REQUEST);
-		}
-
-		$userId = $this->userSession->getUser()->getUID();
-
-		// Set the new value and return it
-		// Using a prefix prevents the user from setting arbitrary keys
-		$this->config->setUserValue($userId, 'files', 'show_' . $key, (string)$show);
-		return new JSONResponse([$key => $show]);
-	}
-
-	/**
-	 * Get sorting-order for custom sorting
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $folderpath
-	 * @return string
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getNodeType($folderpath) {
-		$node = $this->userFolder->get($folderpath);
-		return $node->getType();
-	}
+    private TagService $tagService;
+    private IManager $shareManager;
+    private IPreview $previewManager;
+    private IUserSession $userSession;
+    private IConfig $config;
+    private Folder $userFolder;
+    private UserConfig $userConfig;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserSession $userSession
+     * @param TagService $tagService
+     * @param IPreview $previewManager
+     * @param IManager $shareManager
+     * @param IConfig $config
+     * @param Folder $userFolder
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IUserSession $userSession,
+                                TagService $tagService,
+                                IPreview $previewManager,
+                                IManager $shareManager,
+                                IConfig $config,
+                                Folder $userFolder,
+                                UserConfig $userConfig) {
+        parent::__construct($appName, $request);
+        $this->userSession = $userSession;
+        $this->tagService = $tagService;
+        $this->previewManager = $previewManager;
+        $this->shareManager = $shareManager;
+        $this->config = $config;
+        $this->userFolder = $userFolder;
+        $this->userConfig = $userConfig;
+    }
+
+    /**
+     * Gets a thumbnail of the specified file
+     *
+     * @since API version 1.0
+     *
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @StrictCookieRequired
+     *
+     * @param int $x
+     * @param int $y
+     * @param string $file URL-encoded filename
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getThumbnail($x, $y, $file) {
+        if ($x < 1 || $y < 1) {
+            return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $file = $this->userFolder->get($file);
+            if ($file instanceof Folder) {
+                throw new NotFoundException();
+            }
+
+            /** @var File $file */
+            $preview = $this->previewManager->getPreview($file, $x, $y, true);
+
+            return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse(['message' => 'File not found.'], Http::STATUS_NOT_FOUND);
+        } catch (\Exception $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
+
+    /**
+     * Updates the info of the specified file path
+     * The passed tags are absolute, which means they will
+     * replace the actual tag selection.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $path path
+     * @param array|string $tags array of tags
+     * @return DataResponse
+     */
+    public function updateFileTags($path, $tags = null) {
+        $result = [];
+        // if tags specified or empty array, update tags
+        if (!is_null($tags)) {
+            try {
+                $this->tagService->updateFileTags($path, $tags);
+            } catch (\OCP\Files\NotFoundException $e) {
+                return new DataResponse([
+                    'message' => $e->getMessage()
+                ], Http::STATUS_NOT_FOUND);
+            } catch (\OCP\Files\StorageNotAvailableException $e) {
+                return new DataResponse([
+                    'message' => $e->getMessage()
+                ], Http::STATUS_SERVICE_UNAVAILABLE);
+            } catch (\Exception $e) {
+                return new DataResponse([
+                    'message' => $e->getMessage()
+                ], Http::STATUS_NOT_FOUND);
+            }
+            $result['tags'] = $tags;
+        }
+        return new DataResponse($result);
+    }
+
+    /**
+     * @param \OCP\Files\Node[] $nodes
+     * @return array
+     */
+    private function formatNodes(array $nodes) {
+        $shareTypesForNodes = $this->getShareTypesForNodes($nodes);
+        return array_values(array_map(function (Node $node) use ($shareTypesForNodes) {
+            $shareTypes = $shareTypesForNodes[$node->getId()] ?? [];
+            $file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo());
+            $file['hasPreview'] = $this->previewManager->isAvailable($node);
+            $parts = explode('/', dirname($node->getPath()), 4);
+            if (isset($parts[3])) {
+                $file['path'] = '/' . $parts[3];
+            } else {
+                $file['path'] = '/';
+            }
+            if (!empty($shareTypes)) {
+                $file['shareTypes'] = $shareTypes;
+            }
+            return $file;
+        }, $nodes));
+    }
+
+    /**
+     * Get the share types for each node
+     *
+     * @param \OCP\Files\Node[] $nodes
+     * @return array<int, int[]> list of share types for each fileid
+     */
+    private function getShareTypesForNodes(array $nodes): array {
+        $userId = $this->userSession->getUser()->getUID();
+        $requestedShareTypes = [
+            IShare::TYPE_USER,
+            IShare::TYPE_GROUP,
+            IShare::TYPE_LINK,
+            IShare::TYPE_REMOTE,
+            IShare::TYPE_EMAIL,
+            IShare::TYPE_ROOM,
+            IShare::TYPE_DECK,
+            IShare::TYPE_SCIENCEMESH,
+        ];
+        $shareTypes = [];
+
+        $nodeIds = array_map(function (Node $node) {
+            return $node->getId();
+        }, $nodes);
+
+        foreach ($requestedShareTypes as $shareType) {
+            $nodesLeft = array_combine($nodeIds, array_fill(0, count($nodeIds), true));
+            $offset = 0;
+
+            // fetch shares until we've either found shares for all nodes or there are no more shares left
+            while (count($nodesLeft) > 0) {
+                $shares = $this->shareManager->getSharesBy($userId, $shareType, null, false, 100, $offset);
+                foreach ($shares as $share) {
+                    $fileId = $share->getNodeId();
+                    if (isset($nodesLeft[$fileId])) {
+                        if (!isset($shareTypes[$fileId])) {
+                            $shareTypes[$fileId] = [];
+                        }
+                        $shareTypes[$fileId][] = $shareType;
+                        unset($nodesLeft[$fileId]);
+                    }
+                }
+
+                if (count($shares) < 100) {
+                    break;
+                } else {
+                    $offset += count($shares);
+                }
+            }
+        }
+        return $shareTypes;
+    }
+
+    /**
+     * Returns a list of recently modified files.
+     *
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     */
+    public function getRecentFiles() {
+        $nodes = $this->userFolder->getRecent(100);
+        $files = $this->formatNodes($nodes);
+        return new DataResponse(['files' => $files]);
+    }
+
+
+    /**
+     * Returns the current logged-in user's storage stats.
+     *
+     * @NoAdminRequired
+     *
+     * @param ?string $dir the directory to get the storage stats from
+     * @return JSONResponse
+     */
+    public function getStorageStats($dir = '/'): JSONResponse {
+        $storageInfo = \OC_Helper::getStorageInfo($dir ?: '/');
+        return new JSONResponse(['message' => 'ok', 'data' => $storageInfo]);
+    }
+
+    /**
+     * Change the default sort mode
+     *
+     * @NoAdminRequired
+     *
+     * @param string $mode
+     * @param string $direction
+     * @return JSONResponse
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function updateFileSorting($mode, string $direction = 'asc', string $view = 'files'): JSONResponse {
+        $allowedDirection = ['asc', 'desc'];
+        if (!in_array($direction, $allowedDirection)) {
+            return  new JSONResponse(['message' => 'Invalid direction parameter'], Http::STATUS_UNPROCESSABLE_ENTITY);
+        }
+
+        $userId = $this->userSession->getUser()->getUID();
+
+        $sortingJson = $this->config->getUserValue($userId, 'files', 'files_sorting_configs', '{}');
+        $sortingConfig = json_decode($sortingJson, true) ?: [];
+        $sortingConfig[$view] = [
+            'mode' => $mode,
+            'direction' => $direction,
+        ];
+
+        $this->config->setUserValue($userId, 'files', 'files_sorting_configs', json_encode($sortingConfig));
+        return new JSONResponse([
+            'message' => 'ok',
+            'data' => $sortingConfig,
+        ]);
+    }
+
+    /**
+     * Toggle default files user config
+     *
+     * @NoAdminRequired
+     *
+     * @param string $key
+     * @param string|bool $value
+     * @return JSONResponse
+     */
+    public function setConfig(string $key, $value): JSONResponse {
+        try {
+            $this->userConfig->setConfig($key, (string)$value);
+        } catch (\InvalidArgumentException $e) {
+            return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
+        }
+
+        return new JSONResponse(['message' => 'ok', 'data' => ['key' => $key, 'value' => $value]]);
+    }
+
+
+    /**
+     * Get the user config
+     *
+     * @NoAdminRequired
+     *
+     * @return JSONResponse
+     */
+    public function getConfigs(): JSONResponse {
+        return new JSONResponse(['message' => 'ok', 'data' => $this->userConfig->getConfigs()]);
+    }
+
+    /**
+     * Toggle default for showing/hiding hidden files
+     *
+     * @NoAdminRequired
+     *
+     * @param bool $value
+     * @return Response
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function showHiddenFiles(bool $value): Response {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', $value ? '1' : '0');
+        return new Response();
+    }
+
+    /**
+     * Toggle default for cropping preview images
+     *
+     * @NoAdminRequired
+     *
+     * @param bool $value
+     * @return Response
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function cropImagePreviews(bool $value): Response {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'crop_image_previews', $value ? '1' : '0');
+        return new Response();
+    }
+
+    /**
+     * Toggle default for files grid view
+     *
+     * @NoAdminRequired
+     *
+     * @param bool $show
+     * @return Response
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function showGridView(bool $show): Response {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', $show ? '1' : '0');
+        return new Response();
+    }
+
+    /**
+     * Get default settings for the grid view
+     *
+     * @NoAdminRequired
+     */
+    public function getGridView() {
+        $status = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', '0') === '1';
+        return new JSONResponse(['gridview' => $status]);
+    }
+
+    /**
+     * Toggle default for showing/hiding xxx folder
+     *
+     * @NoAdminRequired
+     *
+     * @param int $show
+     * @param string $key the key of the folder
+     *
+     * @return Response
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function toggleShowFolder(int $show, string $key): Response {
+        if ($show !== 0 && $show !== 1) {
+            return new DataResponse([
+                'message' => 'Invalid show value. Only 0 and 1 are allowed.'
+            ], Http::STATUS_BAD_REQUEST);
+        }
+
+        $userId = $this->userSession->getUser()->getUID();
+
+        // Set the new value and return it
+        // Using a prefix prevents the user from setting arbitrary keys
+        $this->config->setUserValue($userId, 'files', 'show_' . $key, (string)$show);
+        return new JSONResponse([$key => $show]);
+    }
+
+    /**
+     * Get sorting-order for custom sorting
+     *
+     * @NoAdminRequired
+     *
+     * @param string $folderpath
+     * @return string
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getNodeType($folderpath) {
+        $node = $this->userFolder->get($folderpath);
+        return $node->getType();
+    }
 	
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function serviceWorker(): StreamResponse {
-		$response = new StreamResponse(__DIR__ . '/../../../../dist/preview-service-worker.js');
-		$response->setHeaders([
-			'Content-Type' => 'application/javascript',
-			'Service-Worker-Allowed' => '/'
-		]);
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedWorkerSrcDomain("'self'");
-		$policy->addAllowedScriptDomain("'self'");
-		$policy->addAllowedConnectDomain("'self'");
-		$response->setContentSecurityPolicy($policy);
-		return $response;
-	}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function serviceWorker(): StreamResponse {
+        $response = new StreamResponse(__DIR__ . '/../../../../dist/preview-service-worker.js');
+        $response->setHeaders([
+            'Content-Type' => 'application/javascript',
+            'Service-Worker-Allowed' => '/'
+        ]);
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedWorkerSrcDomain("'self'");
+        $policy->addAllowedScriptDomain("'self'");
+        $policy->addAllowedConnectDomain("'self'");
+        $response->setContentSecurityPolicy($policy);
+        return $response;
+    }
 }

apps/files/lib/Controller/ViewController.php

Indentation +346 added lines, -346 removed lines

@@ -67,350 +67,350 @@
  * @package OCA\Files\Controller
  */
 class ViewController extends Controller {
-	private IURLGenerator $urlGenerator;
-	private IL10N $l10n;
-	private IConfig $config;
-	private IEventDispatcher $eventDispatcher;
-	private IUserSession $userSession;
-	private IAppManager $appManager;
-	private IRootFolder $rootFolder;
-	private Helper $activityHelper;
-	private IInitialState $initialState;
-	private ITemplateManager $templateManager;
-	private IManager $shareManager;
-	private UserConfig $userConfig;
-
-	public function __construct(string $appName,
-		IRequest $request,
-		IURLGenerator $urlGenerator,
-		IL10N $l10n,
-		IConfig $config,
-		IEventDispatcher $eventDispatcher,
-		IUserSession $userSession,
-		IAppManager $appManager,
-		IRootFolder $rootFolder,
-		Helper $activityHelper,
-		IInitialState $initialState,
-		ITemplateManager $templateManager,
-		IManager $shareManager,
-		UserConfig $userConfig
-	) {
-		parent::__construct($appName, $request);
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->userSession = $userSession;
-		$this->appManager = $appManager;
-		$this->rootFolder = $rootFolder;
-		$this->activityHelper = $activityHelper;
-		$this->initialState = $initialState;
-		$this->templateManager = $templateManager;
-		$this->shareManager = $shareManager;
-		$this->userConfig = $userConfig;
-	}
-
-	/**
-	 * @param string $appName
-	 * @param string $scriptName
-	 * @return string
-	 */
-	protected function renderScript($appName, $scriptName) {
-		$content = '';
-		$appPath = \OC_App::getAppPath($appName);
-		$scriptPath = $appPath . '/' . $scriptName;
-		if (file_exists($scriptPath)) {
-			// TODO: sanitize path / script name ?
-			ob_start();
-			include $scriptPath;
-			$content = ob_get_contents();
-			@ob_end_clean();
-		}
-
-		return $content;
-	}
-
-	/**
-	 * FIXME: Replace with non static code
-	 *
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	protected function getStorageInfo(string $dir = '/') {
-		$rootInfo = \OC\Files\Filesystem::getFileInfo('/', false);
-
-		return \OC_Helper::getStorageInfo($dir, $rootInfo ?: null);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $fileid
-	 * @return TemplateResponse|RedirectResponse
-	 * @throws NotFoundException
-	 */
-	public function showFile(string $fileid = null, int $openfile = 1): Response {
-		// This is the entry point from the `/f/{fileid}` URL which is hardcoded in the server.
-		try {
-			return $this->redirectToFile($fileid, $openfile !== 0);
-		} catch (NotFoundException $e) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
-		}
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 * @UseSession
-	 *
-	 * @param string $dir
-	 * @param string $view
-	 * @param string $fileid
-	 * @param bool $fileNotFound
-	 * @param string $openfile - the openfile URL parameter if it was present in the initial request
-	 * @return TemplateResponse|RedirectResponse
-	 * @throws NotFoundException
-	 */
-	public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false, $openfile = null) {
-
-		if ($fileid !== null && $dir === '') {
-			try {
-				return $this->redirectToFile($fileid);
-			} catch (NotFoundException $e) {
-				return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
-			}
-		}
-
-		$nav = new \OCP\Template('files', 'appnavigation', '');
-
-		// Load the files we need
-		\OCP\Util::addStyle('files', 'merged');
-		\OCP\Util::addScript('files', 'merged-index', 'files');
-		\OCP\Util::addScript('files', 'main');
-
-		$userId = $this->userSession->getUser()->getUID();
-
-		// Get all the user favorites to create a submenu
-		try {
-			$favElements = $this->activityHelper->getFavoriteFilePaths($userId);
-		} catch (\RuntimeException $e) {
-			$favElements['folders'] = [];
-		}
-
-		$collapseClasses = '';
-		if (count($favElements['folders']) > 0) {
-			$collapseClasses = 'collapsible';
-		}
-
-		$favoritesSublistArray = [];
-
-		$navBarPositionPosition = 6;
-		foreach ($favElements['folders'] as $favElement) {
-			$element = [
-				'id' => str_replace('/', '-', $favElement),
-				'dir' => $favElement,
-				'order' => $navBarPositionPosition,
-				'name' => basename($favElement),
-				'icon' => 'folder',
-				'params' => [
-					'view' => 'files',
-					'dir' => $favElement,
-				],
-			];
-
-			array_push($favoritesSublistArray, $element);
-			$navBarPositionPosition++;
-		}
-
-		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
-
-		// add the favorites entry in menu
-		$navItems['favorites']['sublist'] = $favoritesSublistArray;
-		$navItems['favorites']['classes'] = $collapseClasses;
-
-		// parse every menu and add the expanded user value
-		foreach ($navItems as $key => $item) {
-			$navItems[$key]['expanded'] = $this->config->getUserValue($userId, 'files', 'show_' . $item['id'], '0') === '1';
-		}
-
-		$nav->assign('navigationItems', $navItems);
-
-		$contentItems = [];
-
-		try {
-			// If view is files, we use the directory, otherwise we use the root storage
-			$storageInfo =  $this->getStorageInfo(($view === 'files' && $dir) ? $dir : '/');
-		} catch(\Exception $e) {
-			$storageInfo = $this->getStorageInfo();
-		}
-
-		$this->initialState->provideInitialState('storageStats', $storageInfo);
-		$this->initialState->provideInitialState('navigation', $navItems);
-		$this->initialState->provideInitialState('config', $this->userConfig->getConfigs());
-
-		// File sorting user config
-		$filesSortingConfig = json_decode($this->config->getUserValue($userId, 'files', 'files_sorting_configs', '{}'), true);
-		$this->initialState->provideInitialState('filesSortingConfig', $filesSortingConfig);
-
-		// render the container content for every navigation item
-		foreach ($navItems as $item) {
-			$content = '';
-			if (isset($item['script'])) {
-				$content = $this->renderScript($item['appname'], $item['script']);
-			}
-			// parse submenus
-			if (isset($item['sublist'])) {
-				foreach ($item['sublist'] as $subitem) {
-					$subcontent = '';
-					if (isset($subitem['script'])) {
-						$subcontent = $this->renderScript($subitem['appname'], $subitem['script']);
-					}
-					$contentItems[$subitem['id']] = [
-						'id' => $subitem['id'],
-						'content' => $subcontent
-					];
-				}
-			}
-			$contentItems[$item['id']] = [
-				'id' => $item['id'],
-				'content' => $content
-			];
-		}
-
-		$this->eventDispatcher->dispatchTyped(new ResourcesLoadAdditionalScriptsEvent());
-		$event = new LoadAdditionalScriptsEvent();
-		$this->eventDispatcher->dispatchTyped($event);
-		$this->eventDispatcher->dispatchTyped(new LoadSidebar());
-		// Load Viewer scripts
-		if (class_exists(LoadViewer::class)) {
-			$this->eventDispatcher->dispatchTyped(new LoadViewer());
-		}
-
-		$this->initialState->provideInitialState('templates_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : false);
-		$this->initialState->provideInitialState('templates', $this->templateManager->listCreators());
-
-		$params = [];
-		$params['usedSpacePercent'] = (int) $storageInfo['relative'];
-		$params['owner'] = $storageInfo['owner'] ?? '';
-		$params['ownerDisplayName'] = $storageInfo['ownerDisplayName'] ?? '';
-		$params['isPublic'] = false;
-		$params['allowShareWithLink'] = $this->shareManager->shareApiAllowLinks() ? 'yes' : 'no';
-		$params['defaultFileSorting'] = $filesSortingConfig['files']['mode'] ?? 'basename';
-		$params['defaultFileSortingDirection'] = $filesSortingConfig['files']['direction'] ?? 'asc';
-		$params['showgridview'] = $this->config->getUserValue($userId, 'files', 'show_grid', false);
-		$showHidden = (bool) $this->config->getUserValue($userId, 'files', 'show_hidden', false);
-		$params['showHiddenFiles'] = $showHidden ? 1 : 0;
-		$cropImagePreviews = (bool) $this->config->getUserValue($userId, 'files', 'crop_image_previews', true);
-		$params['cropImagePreviews'] = $cropImagePreviews ? 1 : 0;
-		$params['fileNotFound'] = $fileNotFound ? 1 : 0;
-		$params['appNavigation'] = $nav;
-		$params['appContents'] = $contentItems;
-		$params['hiddenFields'] = $event->getHiddenFields();
-
-		$response = new TemplateResponse(
-			Application::APP_ID,
-			'index',
-			$params
-		);
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedFrameDomain('\'self\'');
-		$response->setContentSecurityPolicy($policy);
-
-		$this->provideInitialState($dir, $openfile);
-
-		return $response;
-	}
-
-	/**
-	 * Add openFileInfo in initialState if $openfile is set.
-	 * @param string $dir - the ?dir= URL param
-	 * @param string $openfile - the ?openfile= URL param
-	 * @return void
-	 */
-	private function provideInitialState(string $dir, ?string $openfile): void {
-		if ($openfile === null) {
-			return;
-		}
-
-		$user = $this->userSession->getUser();
-
-		if ($user === null) {
-			return;
-		}
-
-		$uid = $user->getUID();
-		$userFolder = $this->rootFolder->getUserFolder($uid);
-		$nodes = $userFolder->getById((int) $openfile);
-		$node = array_shift($nodes);
-
-		if ($node === null) {
-			return;
-		}
-
-		// properly format full path and make sure
-		// we're relative to the user home folder
-		$isRoot = $node === $userFolder;
-		$path = $userFolder->getRelativePath($node->getPath());
-		$directory = $userFolder->getRelativePath($node->getParent()->getPath());
-
-		// Prevent opening a file from another folder.
-		if ($dir !== $directory) {
-			return;
-		}
-
-		$this->initialState->provideInitialState(
-			'openFileInfo', [
-				'id' => $node->getId(),
-				'name' => $isRoot ? '' : $node->getName(),
-				'path' => $path,
-				'directory' => $directory,
-				'mime' => $node->getMimetype(),
-				'type' => $node->getType(),
-				'permissions' => $node->getPermissions(),
-			]
-		);
-	}
-
-	/**
-	 * Redirects to the file list and highlight the given file id
-	 *
-	 * @param string $fileId file id to show
-	 * @param bool $setOpenfile - whether or not to set the openfile URL parameter
-	 * @return RedirectResponse redirect response or not found response
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function redirectToFile($fileId, bool $setOpenfile = false) {
-		$uid = $this->userSession->getUser()->getUID();
-		$baseFolder = $this->rootFolder->getUserFolder($uid);
-		$files = $baseFolder->getById($fileId);
-		$params = [];
-
-		if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
-			$baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/');
-			$files = $baseFolder->getById($fileId);
-			$params['view'] = 'trashbin';
-		}
-
-		if (!empty($files)) {
-			$file = current($files);
-			if ($file instanceof Folder) {
-				// set the full path to enter the folder
-				$params['dir'] = $baseFolder->getRelativePath($file->getPath());
-			} else {
-				// set parent path as dir
-				$params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
-				// and scroll to the entry
-				$params['scrollto'] = $file->getName();
-
-				if ($setOpenfile) {
-					// forward the openfile URL parameter.
-					$params['openfile'] = $fileId;
-				}
-			}
-
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
-		}
-		throw new \OCP\Files\NotFoundException();
-	}
+    private IURLGenerator $urlGenerator;
+    private IL10N $l10n;
+    private IConfig $config;
+    private IEventDispatcher $eventDispatcher;
+    private IUserSession $userSession;
+    private IAppManager $appManager;
+    private IRootFolder $rootFolder;
+    private Helper $activityHelper;
+    private IInitialState $initialState;
+    private ITemplateManager $templateManager;
+    private IManager $shareManager;
+    private UserConfig $userConfig;
+
+    public function __construct(string $appName,
+        IRequest $request,
+        IURLGenerator $urlGenerator,
+        IL10N $l10n,
+        IConfig $config,
+        IEventDispatcher $eventDispatcher,
+        IUserSession $userSession,
+        IAppManager $appManager,
+        IRootFolder $rootFolder,
+        Helper $activityHelper,
+        IInitialState $initialState,
+        ITemplateManager $templateManager,
+        IManager $shareManager,
+        UserConfig $userConfig
+    ) {
+        parent::__construct($appName, $request);
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->userSession = $userSession;
+        $this->appManager = $appManager;
+        $this->rootFolder = $rootFolder;
+        $this->activityHelper = $activityHelper;
+        $this->initialState = $initialState;
+        $this->templateManager = $templateManager;
+        $this->shareManager = $shareManager;
+        $this->userConfig = $userConfig;
+    }
+
+    /**
+     * @param string $appName
+     * @param string $scriptName
+     * @return string
+     */
+    protected function renderScript($appName, $scriptName) {
+        $content = '';
+        $appPath = \OC_App::getAppPath($appName);
+        $scriptPath = $appPath . '/' . $scriptName;
+        if (file_exists($scriptPath)) {
+            // TODO: sanitize path / script name ?
+            ob_start();
+            include $scriptPath;
+            $content = ob_get_contents();
+            @ob_end_clean();
+        }
+
+        return $content;
+    }
+
+    /**
+     * FIXME: Replace with non static code
+     *
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    protected function getStorageInfo(string $dir = '/') {
+        $rootInfo = \OC\Files\Filesystem::getFileInfo('/', false);
+
+        return \OC_Helper::getStorageInfo($dir, $rootInfo ?: null);
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     *
+     * @param string $fileid
+     * @return TemplateResponse|RedirectResponse
+     * @throws NotFoundException
+     */
+    public function showFile(string $fileid = null, int $openfile = 1): Response {
+        // This is the entry point from the `/f/{fileid}` URL which is hardcoded in the server.
+        try {
+            return $this->redirectToFile($fileid, $openfile !== 0);
+        } catch (NotFoundException $e) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
+        }
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     * @UseSession
+     *
+     * @param string $dir
+     * @param string $view
+     * @param string $fileid
+     * @param bool $fileNotFound
+     * @param string $openfile - the openfile URL parameter if it was present in the initial request
+     * @return TemplateResponse|RedirectResponse
+     * @throws NotFoundException
+     */
+    public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false, $openfile = null) {
+
+        if ($fileid !== null && $dir === '') {
+            try {
+                return $this->redirectToFile($fileid);
+            } catch (NotFoundException $e) {
+                return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
+            }
+        }
+
+        $nav = new \OCP\Template('files', 'appnavigation', '');
+
+        // Load the files we need
+        \OCP\Util::addStyle('files', 'merged');
+        \OCP\Util::addScript('files', 'merged-index', 'files');
+        \OCP\Util::addScript('files', 'main');
+
+        $userId = $this->userSession->getUser()->getUID();
+
+        // Get all the user favorites to create a submenu
+        try {
+            $favElements = $this->activityHelper->getFavoriteFilePaths($userId);
+        } catch (\RuntimeException $e) {
+            $favElements['folders'] = [];
+        }
+
+        $collapseClasses = '';
+        if (count($favElements['folders']) > 0) {
+            $collapseClasses = 'collapsible';
+        }
+
+        $favoritesSublistArray = [];
+
+        $navBarPositionPosition = 6;
+        foreach ($favElements['folders'] as $favElement) {
+            $element = [
+                'id' => str_replace('/', '-', $favElement),
+                'dir' => $favElement,
+                'order' => $navBarPositionPosition,
+                'name' => basename($favElement),
+                'icon' => 'folder',
+                'params' => [
+                    'view' => 'files',
+                    'dir' => $favElement,
+                ],
+            ];
+
+            array_push($favoritesSublistArray, $element);
+            $navBarPositionPosition++;
+        }
+
+        $navItems = \OCA\Files\App::getNavigationManager()->getAll();
+
+        // add the favorites entry in menu
+        $navItems['favorites']['sublist'] = $favoritesSublistArray;
+        $navItems['favorites']['classes'] = $collapseClasses;
+
+        // parse every menu and add the expanded user value
+        foreach ($navItems as $key => $item) {
+            $navItems[$key]['expanded'] = $this->config->getUserValue($userId, 'files', 'show_' . $item['id'], '0') === '1';
+        }
+
+        $nav->assign('navigationItems', $navItems);
+
+        $contentItems = [];
+
+        try {
+            // If view is files, we use the directory, otherwise we use the root storage
+            $storageInfo =  $this->getStorageInfo(($view === 'files' && $dir) ? $dir : '/');
+        } catch(\Exception $e) {
+            $storageInfo = $this->getStorageInfo();
+        }
+
+        $this->initialState->provideInitialState('storageStats', $storageInfo);
+        $this->initialState->provideInitialState('navigation', $navItems);
+        $this->initialState->provideInitialState('config', $this->userConfig->getConfigs());
+
+        // File sorting user config
+        $filesSortingConfig = json_decode($this->config->getUserValue($userId, 'files', 'files_sorting_configs', '{}'), true);
+        $this->initialState->provideInitialState('filesSortingConfig', $filesSortingConfig);
+
+        // render the container content for every navigation item
+        foreach ($navItems as $item) {
+            $content = '';
+            if (isset($item['script'])) {
+                $content = $this->renderScript($item['appname'], $item['script']);
+            }
+            // parse submenus
+            if (isset($item['sublist'])) {
+                foreach ($item['sublist'] as $subitem) {
+                    $subcontent = '';
+                    if (isset($subitem['script'])) {
+                        $subcontent = $this->renderScript($subitem['appname'], $subitem['script']);
+                    }
+                    $contentItems[$subitem['id']] = [
+                        'id' => $subitem['id'],
+                        'content' => $subcontent
+                    ];
+                }
+            }
+            $contentItems[$item['id']] = [
+                'id' => $item['id'],
+                'content' => $content
+            ];
+        }
+
+        $this->eventDispatcher->dispatchTyped(new ResourcesLoadAdditionalScriptsEvent());
+        $event = new LoadAdditionalScriptsEvent();
+        $this->eventDispatcher->dispatchTyped($event);
+        $this->eventDispatcher->dispatchTyped(new LoadSidebar());
+        // Load Viewer scripts
+        if (class_exists(LoadViewer::class)) {
+            $this->eventDispatcher->dispatchTyped(new LoadViewer());
+        }
+
+        $this->initialState->provideInitialState('templates_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : false);
+        $this->initialState->provideInitialState('templates', $this->templateManager->listCreators());
+
+        $params = [];
+        $params['usedSpacePercent'] = (int) $storageInfo['relative'];
+        $params['owner'] = $storageInfo['owner'] ?? '';
+        $params['ownerDisplayName'] = $storageInfo['ownerDisplayName'] ?? '';
+        $params['isPublic'] = false;
+        $params['allowShareWithLink'] = $this->shareManager->shareApiAllowLinks() ? 'yes' : 'no';
+        $params['defaultFileSorting'] = $filesSortingConfig['files']['mode'] ?? 'basename';
+        $params['defaultFileSortingDirection'] = $filesSortingConfig['files']['direction'] ?? 'asc';
+        $params['showgridview'] = $this->config->getUserValue($userId, 'files', 'show_grid', false);
+        $showHidden = (bool) $this->config->getUserValue($userId, 'files', 'show_hidden', false);
+        $params['showHiddenFiles'] = $showHidden ? 1 : 0;
+        $cropImagePreviews = (bool) $this->config->getUserValue($userId, 'files', 'crop_image_previews', true);
+        $params['cropImagePreviews'] = $cropImagePreviews ? 1 : 0;
+        $params['fileNotFound'] = $fileNotFound ? 1 : 0;
+        $params['appNavigation'] = $nav;
+        $params['appContents'] = $contentItems;
+        $params['hiddenFields'] = $event->getHiddenFields();
+
+        $response = new TemplateResponse(
+            Application::APP_ID,
+            'index',
+            $params
+        );
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedFrameDomain('\'self\'');
+        $response->setContentSecurityPolicy($policy);
+
+        $this->provideInitialState($dir, $openfile);
+
+        return $response;
+    }
+
+    /**
+     * Add openFileInfo in initialState if $openfile is set.
+     * @param string $dir - the ?dir= URL param
+     * @param string $openfile - the ?openfile= URL param
+     * @return void
+     */
+    private function provideInitialState(string $dir, ?string $openfile): void {
+        if ($openfile === null) {
+            return;
+        }
+
+        $user = $this->userSession->getUser();
+
+        if ($user === null) {
+            return;
+        }
+
+        $uid = $user->getUID();
+        $userFolder = $this->rootFolder->getUserFolder($uid);
+        $nodes = $userFolder->getById((int) $openfile);
+        $node = array_shift($nodes);
+
+        if ($node === null) {
+            return;
+        }
+
+        // properly format full path and make sure
+        // we're relative to the user home folder
+        $isRoot = $node === $userFolder;
+        $path = $userFolder->getRelativePath($node->getPath());
+        $directory = $userFolder->getRelativePath($node->getParent()->getPath());
+
+        // Prevent opening a file from another folder.
+        if ($dir !== $directory) {
+            return;
+        }
+
+        $this->initialState->provideInitialState(
+            'openFileInfo', [
+                'id' => $node->getId(),
+                'name' => $isRoot ? '' : $node->getName(),
+                'path' => $path,
+                'directory' => $directory,
+                'mime' => $node->getMimetype(),
+                'type' => $node->getType(),
+                'permissions' => $node->getPermissions(),
+            ]
+        );
+    }
+
+    /**
+     * Redirects to the file list and highlight the given file id
+     *
+     * @param string $fileId file id to show
+     * @param bool $setOpenfile - whether or not to set the openfile URL parameter
+     * @return RedirectResponse redirect response or not found response
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function redirectToFile($fileId, bool $setOpenfile = false) {
+        $uid = $this->userSession->getUser()->getUID();
+        $baseFolder = $this->rootFolder->getUserFolder($uid);
+        $files = $baseFolder->getById($fileId);
+        $params = [];
+
+        if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
+            $baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/');
+            $files = $baseFolder->getById($fileId);
+            $params['view'] = 'trashbin';
+        }
+
+        if (!empty($files)) {
+            $file = current($files);
+            if ($file instanceof Folder) {
+                // set the full path to enter the folder
+                $params['dir'] = $baseFolder->getRelativePath($file->getPath());
+            } else {
+                // set parent path as dir
+                $params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
+                // and scroll to the entry
+                $params['scrollto'] = $file->getName();
+
+                if ($setOpenfile) {
+                    // forward the openfile URL parameter.
+                    $params['openfile'] = $fileId;
+                }
+            }
+
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
+        }
+        throw new \OCP\Files\NotFoundException();
+    }
 }

apps/files/appinfo/routes.php

Indentation +170 added lines, -170 removed lines

@@ -42,178 +42,178 @@
 // Legacy routes above
 /** @var \OC\Route\Router $this */
 $this->create('files_ajax_download', 'apps/files/ajax/download.php')
-	->actionInclude('files/ajax/download.php');
+    ->actionInclude('files/ajax/download.php');
 
 /** @var Application $application */
 $application = \OC::$server->get(Application::class);
 $application->registerRoutes(
-	$this,
-	[
-		'routes' => [
-			[
-				'name' => 'view#index',
-				'url' => '/',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'View#showFile',
-				'url' => '/f/{fileid}',
-				'verb' => 'GET',
-				'root' => '',
-			],
-			[
-				'name' => 'API#getThumbnail',
-				'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
-				'verb' => 'GET',
-				'requirements' => ['file' => '.+']
-			],
-			[
-				'name' => 'API#updateFileTags',
-				'url' => '/api/v1/files/{path}',
-				'verb' => 'POST',
-				'requirements' => ['path' => '.+'],
-			],
-			[
-				'name' => 'API#getRecentFiles',
-				'url' => '/api/v1/recent/',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'API#getStorageStats',
-				'url' => '/api/v1/stats',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'API#setConfig',
-				'url' => '/api/v1/config/{key}',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'API#getConfigs',
-				'url' => '/api/v1/configs',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'API#updateFileSorting',
-				'url' => '/api/v1/sorting',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'API#showHiddenFiles',
-				'url' => '/api/v1/showhidden',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'API#cropImagePreviews',
-				'url' => '/api/v1/cropimagepreviews',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'API#showGridView',
-				'url' => '/api/v1/showgridview',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'API#getGridView',
-				'url' => '/api/v1/showgridview',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'API#toggleShowFolder',
-				'url' => '/api/v1/toggleShowFolder/{key}',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'API#getNodeType',
-				'url' => '/api/v1/quickaccess/get/NodeType',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'DirectEditingView#edit',
-				'url' => '/directEditing/{token}',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'api#serviceWorker',
-				'url' => '/preview-service-worker.js',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'view#index',
-				'url' => '/{view}',
-				'verb' => 'GET',
-				'postfix' => 'view',
-			],
-			[
-				'name' => 'view#index',
-				'url' => '/{view}/{fileid}',
-				'verb' => 'GET',
-				'postfix' => 'fileid',
-			],
-		],
-		'ocs' => [
-			[
-				'name' => 'DirectEditing#info',
-				'url' => '/api/v1/directEditing',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'DirectEditing#templates',
-				'url' => '/api/v1/directEditing/templates/{editorId}/{creatorId}',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'DirectEditing#open',
-				'url' => '/api/v1/directEditing/open',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'DirectEditing#create',
-				'url' => '/api/v1/directEditing/create',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'Template#list',
-				'url' => '/api/v1/templates',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'Template#create',
-				'url' => '/api/v1/templates/create',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'Template#path',
-				'url' => '/api/v1/templates/path',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'TransferOwnership#transfer',
-				'url' => '/api/v1/transferownership',
-				'verb' => 'POST',
-			],
-			[
-				'name' => 'TransferOwnership#accept',
-				'url' => '/api/v1/transferownership/{id}',
-				'verb' => 'POST',
-			],
-			[
-				'name' => 'TransferOwnership#reject',
-				'url' => '/api/v1/transferownership/{id}',
-				'verb' => 'DELETE',
-			],
-			[
-				/** @see OpenLocalEditorController::create() */
-				'name' => 'OpenLocalEditor#create',
-				'url' => '/api/v1/openlocaleditor',
-				'verb' => 'POST',
-			],
-			[
-				/** @see OpenLocalEditorController::validate() */
-				'name' => 'OpenLocalEditor#validate',
-				'url' => '/api/v1/openlocaleditor/{token}',
-				'verb' => 'POST',
-			],
-		],
-	]
+    $this,
+    [
+        'routes' => [
+            [
+                'name' => 'view#index',
+                'url' => '/',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'View#showFile',
+                'url' => '/f/{fileid}',
+                'verb' => 'GET',
+                'root' => '',
+            ],
+            [
+                'name' => 'API#getThumbnail',
+                'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
+                'verb' => 'GET',
+                'requirements' => ['file' => '.+']
+            ],
+            [
+                'name' => 'API#updateFileTags',
+                'url' => '/api/v1/files/{path}',
+                'verb' => 'POST',
+                'requirements' => ['path' => '.+'],
+            ],
+            [
+                'name' => 'API#getRecentFiles',
+                'url' => '/api/v1/recent/',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'API#getStorageStats',
+                'url' => '/api/v1/stats',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'API#setConfig',
+                'url' => '/api/v1/config/{key}',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'API#getConfigs',
+                'url' => '/api/v1/configs',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'API#updateFileSorting',
+                'url' => '/api/v1/sorting',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'API#showHiddenFiles',
+                'url' => '/api/v1/showhidden',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'API#cropImagePreviews',
+                'url' => '/api/v1/cropimagepreviews',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'API#showGridView',
+                'url' => '/api/v1/showgridview',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'API#getGridView',
+                'url' => '/api/v1/showgridview',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'API#toggleShowFolder',
+                'url' => '/api/v1/toggleShowFolder/{key}',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'API#getNodeType',
+                'url' => '/api/v1/quickaccess/get/NodeType',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'DirectEditingView#edit',
+                'url' => '/directEditing/{token}',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'api#serviceWorker',
+                'url' => '/preview-service-worker.js',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'view#index',
+                'url' => '/{view}',
+                'verb' => 'GET',
+                'postfix' => 'view',
+            ],
+            [
+                'name' => 'view#index',
+                'url' => '/{view}/{fileid}',
+                'verb' => 'GET',
+                'postfix' => 'fileid',
+            ],
+        ],
+        'ocs' => [
+            [
+                'name' => 'DirectEditing#info',
+                'url' => '/api/v1/directEditing',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'DirectEditing#templates',
+                'url' => '/api/v1/directEditing/templates/{editorId}/{creatorId}',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'DirectEditing#open',
+                'url' => '/api/v1/directEditing/open',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'DirectEditing#create',
+                'url' => '/api/v1/directEditing/create',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'Template#list',
+                'url' => '/api/v1/templates',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'Template#create',
+                'url' => '/api/v1/templates/create',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'Template#path',
+                'url' => '/api/v1/templates/path',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'TransferOwnership#transfer',
+                'url' => '/api/v1/transferownership',
+                'verb' => 'POST',
+            ],
+            [
+                'name' => 'TransferOwnership#accept',
+                'url' => '/api/v1/transferownership/{id}',
+                'verb' => 'POST',
+            ],
+            [
+                'name' => 'TransferOwnership#reject',
+                'url' => '/api/v1/transferownership/{id}',
+                'verb' => 'DELETE',
+            ],
+            [
+                /** @see OpenLocalEditorController::create() */
+                'name' => 'OpenLocalEditor#create',
+                'url' => '/api/v1/openlocaleditor',
+                'verb' => 'POST',
+            ],
+            [
+                /** @see OpenLocalEditorController::validate() */
+                'name' => 'OpenLocalEditor#validate',
+                'url' => '/api/v1/openlocaleditor/{token}',
+                'verb' => 'POST',
+            ],
+        ],
+    ]
 );

apps/files_trashbin/lib/AppInfo/Application.php

Indentation +45 added lines, -45 removed lines

@@ -42,58 +42,58 @@
 use OCP\IServerContainer;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'files_trashbin';
+    public const APP_ID = 'files_trashbin';
 
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerCapability(Capabilities::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerCapability(Capabilities::class);
 
-		$context->registerServiceAlias('Expiration', Expiration::class);
-		$context->registerServiceAlias(ITrashManager::class, TrashManager::class);
-		/** Register $principalBackend for the DAV collection */
-		$context->registerServiceAlias('principalBackend', Principal::class);
+        $context->registerServiceAlias('Expiration', Expiration::class);
+        $context->registerServiceAlias(ITrashManager::class, TrashManager::class);
+        /** Register $principalBackend for the DAV collection */
+        $context->registerServiceAlias('principalBackend', Principal::class);
 
-		$context->registerUserMigrator(TrashbinMigrator::class);
+        $context->registerUserMigrator(TrashbinMigrator::class);
 
-		$context->registerEventListener(
-			LoadAdditionalScriptsEvent::class,
-			LoadAdditionalScripts::class
-		);
-	}
+        $context->registerEventListener(
+            LoadAdditionalScriptsEvent::class,
+            LoadAdditionalScripts::class
+        );
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn([$this, 'registerTrashBackends']);
+    public function boot(IBootContext $context): void {
+        $context->injectFn([$this, 'registerTrashBackends']);
 
-		// create storage wrapper on setup
-		\OCP\Util::connectHook('OC_Filesystem', 'preSetup', 'OCA\Files_Trashbin\Storage', 'setupStorage');
-		//Listen to delete user signal
-		\OCP\Util::connectHook('OC_User', 'pre_deleteUser', 'OCA\Files_Trashbin\Hooks', 'deleteUser_hook');
-		//Listen to post write hook
-		\OCP\Util::connectHook('OC_Filesystem', 'post_write', 'OCA\Files_Trashbin\Hooks', 'post_write_hook');
-		// pre and post-rename, disable trash logic for the copy+unlink case
-		\OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Trashbin\Trashbin', 'ensureFileScannedHook');
-	}
+        // create storage wrapper on setup
+        \OCP\Util::connectHook('OC_Filesystem', 'preSetup', 'OCA\Files_Trashbin\Storage', 'setupStorage');
+        //Listen to delete user signal
+        \OCP\Util::connectHook('OC_User', 'pre_deleteUser', 'OCA\Files_Trashbin\Hooks', 'deleteUser_hook');
+        //Listen to post write hook
+        \OCP\Util::connectHook('OC_Filesystem', 'post_write', 'OCA\Files_Trashbin\Hooks', 'post_write_hook');
+        // pre and post-rename, disable trash logic for the copy+unlink case
+        \OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Trashbin\Trashbin', 'ensureFileScannedHook');
+    }
 
-	public function registerTrashBackends(IServerContainer $serverContainer, ILogger $logger, IAppManager $appManager, ITrashManager $trashManager) {
-		foreach ($appManager->getInstalledApps() as $app) {
-			$appInfo = $appManager->getAppInfo($app);
-			if (isset($appInfo['trash'])) {
-				$backends = $appInfo['trash'];
-				foreach ($backends as $backend) {
-					$class = $backend['@value'];
-					$for = $backend['@attributes']['for'];
+    public function registerTrashBackends(IServerContainer $serverContainer, ILogger $logger, IAppManager $appManager, ITrashManager $trashManager) {
+        foreach ($appManager->getInstalledApps() as $app) {
+            $appInfo = $appManager->getAppInfo($app);
+            if (isset($appInfo['trash'])) {
+                $backends = $appInfo['trash'];
+                foreach ($backends as $backend) {
+                    $class = $backend['@value'];
+                    $for = $backend['@attributes']['for'];
 
-					try {
-						$backendObject = $serverContainer->query($class);
-						$trashManager->registerBackend($for, $backendObject);
-					} catch (\Exception $e) {
-						$logger->logException($e);
-					}
-				}
-			}
-		}
-	}
+                    try {
+                        $backendObject = $serverContainer->query($class);
+                        $trashManager->registerBackend($for, $backendObject);
+                    } catch (\Exception $e) {
+                        $logger->logException($e);
+                    }
+                }
+            }
+        }
+    }
 }

apps/files_trashbin/lib/Listeners/LoadAdditionalScripts.php

Indentation +6 added lines, -6 removed lines

@@ -31,11 +31,11 @@
 use OCP\Util;
 
 class LoadAdditionalScripts implements IEventListener {
-	public function handle(Event $event): void {
-		if (!($event instanceof LoadAdditionalScriptsEvent)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof LoadAdditionalScriptsEvent)) {
+            return;
+        }
 
-		Util::addScript(Application::APP_ID, 'main');
-	}
+        Util::addScript(Application::APP_ID, 'main');
+    }
 }

apps/files_trashbin/lib/Controller/PreviewController.php

Indentation +85 added lines, -85 removed lines

@@ -43,92 +43,92 @@
 use OCP\IUserSession;
 
 class PreviewController extends Controller {
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var ITrashManager */
-	private $trashManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
-
-	/** @var IPreview */
-	private $previewManager;
-
-	/** @var ITimeFactory */
-	private $time;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IRootFolder $rootFolder,
-		ITrashManager $trashManager,
-		IUserSession $userSession,
-		IMimeTypeDetector $mimeTypeDetector,
-		IPreview $previewManager,
-		ITimeFactory $time
-	) {
-		parent::__construct($appName, $request);
-
-		$this->trashManager = $trashManager;
-		$this->rootFolder = $rootFolder;
-		$this->userSession = $userSession;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->previewManager = $previewManager;
-		$this->time = $time;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @return DataResponse|Http\FileDisplayResponse
-	 */
-	public function getPreview(
-		int $fileId = -1,
-		int $x = 32,
-		int $y = 32,
-		bool $a = false,
-	) {
-		if ($fileId === -1 || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$file = $this->trashManager->getTrashNodeById($this->userSession->getUser(), $fileId);
-			if ($file === null) {
-				return new DataResponse([], Http::STATUS_NOT_FOUND);
-			}
-			if ($file instanceof Folder) {
-				return new DataResponse([], Http::STATUS_BAD_REQUEST);
-			}
-
-			$pathParts = pathinfo($file->getName());
-			$extension = $pathParts['extension'] ?? '';
-			$fileName = $pathParts['filename'];
-			/*
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var ITrashManager */
+    private $trashManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
+
+    /** @var IPreview */
+    private $previewManager;
+
+    /** @var ITimeFactory */
+    private $time;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IRootFolder $rootFolder,
+        ITrashManager $trashManager,
+        IUserSession $userSession,
+        IMimeTypeDetector $mimeTypeDetector,
+        IPreview $previewManager,
+        ITimeFactory $time
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->trashManager = $trashManager;
+        $this->rootFolder = $rootFolder;
+        $this->userSession = $userSession;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+        $this->previewManager = $previewManager;
+        $this->time = $time;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @return DataResponse|Http\FileDisplayResponse
+     */
+    public function getPreview(
+        int $fileId = -1,
+        int $x = 32,
+        int $y = 32,
+        bool $a = false,
+    ) {
+        if ($fileId === -1 || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $file = $this->trashManager->getTrashNodeById($this->userSession->getUser(), $fileId);
+            if ($file === null) {
+                return new DataResponse([], Http::STATUS_NOT_FOUND);
+            }
+            if ($file instanceof Folder) {
+                return new DataResponse([], Http::STATUS_BAD_REQUEST);
+            }
+
+            $pathParts = pathinfo($file->getName());
+            $extension = $pathParts['extension'] ?? '';
+            $fileName = $pathParts['filename'];
+            /*
 			 * Files in the root of the trashbin are timetamped.
 			 * So we have to strip that in order to properly detect the mimetype of the file.
 			 */
-			if (preg_match('/d\d+/', $extension)) {
-				$mimeType = $this->mimeTypeDetector->detectPath($fileName);
-			} else {
-				$mimeType = $this->mimeTypeDetector->detectPath($file->getName());
-			}
-
-			$f = $this->previewManager->getPreview($file, $x, $y, $a, IPreview::MODE_FILL, $mimeType);
-			$response = new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-
-			// Cache previews for 24H
-			$response->cacheFor(3600 * 24);
-			return $response;
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
+            if (preg_match('/d\d+/', $extension)) {
+                $mimeType = $this->mimeTypeDetector->detectPath($fileName);
+            } else {
+                $mimeType = $this->mimeTypeDetector->detectPath($file->getName());
+            }
+
+            $f = $this->previewManager->getPreview($file, $x, $y, $a, IPreview::MODE_FILL, $mimeType);
+            $response = new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+
+            // Cache previews for 24H
+            $response->cacheFor(3600 * 24);
+            return $response;
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }