nextcloud / server

apps/files/appinfo/routes.php

Indentation +165 added lines, -165 removed lines

@@ -42,173 +42,173 @@
 // Legacy routes above
 /** @var $this \OC\Route\Router */
 $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->query(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' => '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' => '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/templates/appnavigation.php

Indentation +19 added lines, -19 removed lines

@@ -4,11 +4,11 @@ 
 
 		<?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>
 
@@ -25,7 +25,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 } ?>
@@ -33,8 +33,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 } ?>>
@@ -44,26 +44,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;
 }
 
 /**
@@ -74,8 +74,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>
@@ -91,5 +91,5 @@ 
 			</ul>
 		</div>
 	<?php
-	}
+    }
 }

apps/files/lib/Controller/ApiController.php

Indentation +326 added lines, -326 removed lines

@@ -62,358 +62,358 @@
  * @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;
+    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;
-	}
+    /**
+     * @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);
-		}
+    /**
+     * 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();
-			}
+        try {
+            $file = $this->userFolder->get($file);
+            if ($file instanceof Folder) {
+                throw new NotFoundException();
+            }
 
-			/** @var File $file */
-			$preview = $this->previewManager->getPreview($file, $x, $y, true);
+            /** @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);
-		}
-	}
+            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);
-	}
+    /**
+     * 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));
-	}
+    /**
+     * @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,
-		];
-		$shareTypes = [];
+    /**
+     * 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,
+        ];
+        $shareTypes = [];
 
-		$nodeIds = array_map(function (Node $node) {
-			return $node->getId();
-		}, $nodes);
+        $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;
+        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]);
-					}
-				}
+            // 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;
-	}
+                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 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]);
-	}
+    /**
+     * 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 Response
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function updateFileSorting($mode, $direction) {
-		$allowedMode = ['name', 'size', 'mtime'];
-		$allowedDirection = ['asc', 'desc'];
-		if (!in_array($mode, $allowedMode) || !in_array($direction, $allowedDirection)) {
-			$response = new Response();
-			$response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
-			return $response;
-		}
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting', $mode);
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting_direction', $direction);
-		return new Response();
-	}
+    /**
+     * Change the default sort mode
+     *
+     * @NoAdminRequired
+     *
+     * @param string $mode
+     * @param string $direction
+     * @return Response
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function updateFileSorting($mode, $direction) {
+        $allowedMode = ['name', 'size', 'mtime'];
+        $allowedDirection = ['asc', 'desc'];
+        if (!in_array($mode, $allowedMode) || !in_array($direction, $allowedDirection)) {
+            $response = new Response();
+            $response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
+            return $response;
+        }
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting', $mode);
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting_direction', $direction);
+        return new Response();
+    }
 
-	/**
-	 * 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);
-		}
+    /**
+     * 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]]);
-	}
+        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()]);
-	}
+    /**
+     * 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 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 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();
-	}
+    /**
+     * 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]);
-	}
+    /**
+     * 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);
-		}
+    /**
+     * 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();
+        $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]);
-	}
+        // 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();
-	}
+    /**
+     * 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();
+    }
 }

apps/files/lib/Controller/ViewController.php

Indentation +347 added lines, -347 removed lines

@@ -67,351 +67,351 @@
  * @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 = '/') {
-		\OC_Util::setupFS();
-		$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');
-
-		// mostly for the home storage's free space
-		// FIXME: Make non static
-		$storageInfo = $this->getStorageInfo();
-
-		$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());
-
-		// 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'] = $this->config->getUserValue($userId, 'files', 'file_sorting', 'name');
-		$params['defaultFileSortingDirection'] = $this->config->getUserValue($userId, 'files', 'file_sorting_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 = '/') {
+        \OC_Util::setupFS();
+        $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');
+
+        // mostly for the home storage's free space
+        // FIXME: Make non static
+        $storageInfo = $this->getStorageInfo();
+
+        $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());
+
+        // 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'] = $this->config->getUserValue($userId, 'files', 'file_sorting', 'name');
+        $params['defaultFileSortingDirection'] = $this->config->getUserValue($userId, 'files', 'file_sorting_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();
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -118,7 +118,7 @@ 
 	protected function renderScript($appName, $scriptName) {
 		$content = '';
 		$appPath = \OC_App::getAppPath($appName);
-		$scriptPath = $appPath . '/' . $scriptName;
+		$scriptPath = $appPath.'/'.$scriptName;
 		if (file_exists($scriptPath)) {
 			// TODO: sanitize path / script name ?
 			ob_start();
@@ -236,7 +236,7 @@ 
 
 		// 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';
+			$navItems[$key]['expanded'] = $this->config->getUserValue($userId, 'files', 'show_'.$item['id'], '0') === '1';
 		}
 
 		$nav->assign('navigationItems', $navItems);
@@ -245,8 +245,8 @@ 
 
 		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(($view === 'files' && $dir) ? $dir : '/');
+		} catch (\Exception $e) {
 			$storageInfo = $this->getStorageInfo();
 		}
 
@@ -388,7 +388,7 @@ 
 		$params = [];
 
 		if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
-			$baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/');
+			$baseFolder = $this->rootFolder->get($uid.'/files_trashbin/files/');
 			$files = $baseFolder->getById($fileId);
 			$params['view'] = 'trashbin';
 		}

apps/files/composer/composer/autoload_classmap.php

Spacing +53 added lines, -53 removed lines

@@ -6,57 +6,57 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir . '/../lib/Activity/FavoriteProvider.php',
-    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir . '/../lib/Activity/Filter/Favorites.php',
-    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir . '/../lib/Activity/Filter/FileChanges.php',
-    'OCA\\Files\\Activity\\Helper' => $baseDir . '/../lib/Activity/Helper.php',
-    'OCA\\Files\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
-    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
-    'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir . '/../lib/Activity/Settings/FileActivitySettings.php',
-    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
-    'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => $baseDir . '/../lib/Activity/Settings/FileFavoriteChanged.php',
-    'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
-    'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
-    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',
-    'OCA\\Files\\BackgroundJob\\DeleteExpiredOpenLocalEditor' => $baseDir . '/../lib/BackgroundJob/DeleteExpiredOpenLocalEditor.php',
-    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
-    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir . '/../lib/BackgroundJob/ScanFiles.php',
-    'OCA\\Files\\BackgroundJob\\TransferOwnership' => $baseDir . '/../lib/BackgroundJob/TransferOwnership.php',
-    'OCA\\Files\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\Files\\Collaboration\\Resources\\Listener' => $baseDir . '/../lib/Collaboration/Resources/Listener.php',
-    'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => $baseDir . '/../lib/Collaboration/Resources/ResourceProvider.php',
-    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir . '/../lib/Command/DeleteOrphanedFiles.php',
-    'OCA\\Files\\Command\\RepairTree' => $baseDir . '/../lib/Command/RepairTree.php',
-    'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php',
-    'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php',
-    'OCA\\Files\\Command\\TransferOwnership' => $baseDir . '/../lib/Command/TransferOwnership.php',
-    'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php',
-    'OCA\\Files\\Controller\\DirectEditingController' => $baseDir . '/../lib/Controller/DirectEditingController.php',
-    'OCA\\Files\\Controller\\DirectEditingViewController' => $baseDir . '/../lib/Controller/DirectEditingViewController.php',
-    'OCA\\Files\\Controller\\OpenLocalEditorController' => $baseDir . '/../lib/Controller/OpenLocalEditorController.php',
-    'OCA\\Files\\Controller\\TemplateController' => $baseDir . '/../lib/Controller/TemplateController.php',
-    'OCA\\Files\\Controller\\TransferOwnershipController' => $baseDir . '/../lib/Controller/TransferOwnershipController.php',
-    'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php',
-    'OCA\\Files\\Db\\OpenLocalEditor' => $baseDir . '/../lib/Db/OpenLocalEditor.php',
-    'OCA\\Files\\Db\\OpenLocalEditorMapper' => $baseDir . '/../lib/Db/OpenLocalEditorMapper.php',
-    'OCA\\Files\\Db\\TransferOwnership' => $baseDir . '/../lib/Db/TransferOwnership.php',
-    'OCA\\Files\\Db\\TransferOwnershipMapper' => $baseDir . '/../lib/Db/TransferOwnershipMapper.php',
-    'OCA\\Files\\DirectEditingCapabilities' => $baseDir . '/../lib/DirectEditingCapabilities.php',
-    'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => $baseDir . '/../lib/Event/LoadAdditionalScriptsEvent.php',
-    'OCA\\Files\\Event\\LoadSidebar' => $baseDir . '/../lib/Event/LoadSidebar.php',
-    'OCA\\Files\\Exception\\TransferOwnershipException' => $baseDir . '/../lib/Exception/TransferOwnershipException.php',
-    'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php',
-    'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => $baseDir . '/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
-    'OCA\\Files\\Listener\\LoadSidebarListener' => $baseDir . '/../lib/Listener/LoadSidebarListener.php',
-    'OCA\\Files\\Migration\\Version11301Date20191205150729' => $baseDir . '/../lib/Migration/Version11301Date20191205150729.php',
-    'OCA\\Files\\Migration\\Version12101Date20221011153334' => $baseDir . '/../lib/Migration/Version12101Date20221011153334.php',
-    'OCA\\Files\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
-    'OCA\\Files\\Search\\FilesSearchProvider' => $baseDir . '/../lib/Search/FilesSearchProvider.php',
-    'OCA\\Files\\Service\\DirectEditingService' => $baseDir . '/../lib/Service/DirectEditingService.php',
-    'OCA\\Files\\Service\\OwnershipTransferService' => $baseDir . '/../lib/Service/OwnershipTransferService.php',
-    'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
-    'OCA\\Files\\Service\\UserConfig' => $baseDir . '/../lib/Service/UserConfig.php',
-    'OCA\\Files\\Settings\\PersonalSettings' => $baseDir . '/../lib/Settings/PersonalSettings.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir.'/../lib/Activity/FavoriteProvider.php',
+    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir.'/../lib/Activity/Filter/Favorites.php',
+    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir.'/../lib/Activity/Filter/FileChanges.php',
+    'OCA\\Files\\Activity\\Helper' => $baseDir.'/../lib/Activity/Helper.php',
+    'OCA\\Files\\Activity\\Provider' => $baseDir.'/../lib/Activity/Provider.php',
+    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir.'/../lib/Activity/Settings/FavoriteAction.php',
+    'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir.'/../lib/Activity/Settings/FileActivitySettings.php',
+    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir.'/../lib/Activity/Settings/FileChanged.php',
+    'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => $baseDir.'/../lib/Activity/Settings/FileFavoriteChanged.php',
+    'OCA\\Files\\App' => $baseDir.'/../lib/App.php',
+    'OCA\\Files\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir.'/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
+    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir.'/../lib/BackgroundJob/CleanupFileLocks.php',
+    'OCA\\Files\\BackgroundJob\\DeleteExpiredOpenLocalEditor' => $baseDir.'/../lib/BackgroundJob/DeleteExpiredOpenLocalEditor.php',
+    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
+    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir.'/../lib/BackgroundJob/ScanFiles.php',
+    'OCA\\Files\\BackgroundJob\\TransferOwnership' => $baseDir.'/../lib/BackgroundJob/TransferOwnership.php',
+    'OCA\\Files\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\Files\\Collaboration\\Resources\\Listener' => $baseDir.'/../lib/Collaboration/Resources/Listener.php',
+    'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => $baseDir.'/../lib/Collaboration/Resources/ResourceProvider.php',
+    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir.'/../lib/Command/DeleteOrphanedFiles.php',
+    'OCA\\Files\\Command\\RepairTree' => $baseDir.'/../lib/Command/RepairTree.php',
+    'OCA\\Files\\Command\\Scan' => $baseDir.'/../lib/Command/Scan.php',
+    'OCA\\Files\\Command\\ScanAppData' => $baseDir.'/../lib/Command/ScanAppData.php',
+    'OCA\\Files\\Command\\TransferOwnership' => $baseDir.'/../lib/Command/TransferOwnership.php',
+    'OCA\\Files\\Controller\\ApiController' => $baseDir.'/../lib/Controller/ApiController.php',
+    'OCA\\Files\\Controller\\DirectEditingController' => $baseDir.'/../lib/Controller/DirectEditingController.php',
+    'OCA\\Files\\Controller\\DirectEditingViewController' => $baseDir.'/../lib/Controller/DirectEditingViewController.php',
+    'OCA\\Files\\Controller\\OpenLocalEditorController' => $baseDir.'/../lib/Controller/OpenLocalEditorController.php',
+    'OCA\\Files\\Controller\\TemplateController' => $baseDir.'/../lib/Controller/TemplateController.php',
+    'OCA\\Files\\Controller\\TransferOwnershipController' => $baseDir.'/../lib/Controller/TransferOwnershipController.php',
+    'OCA\\Files\\Controller\\ViewController' => $baseDir.'/../lib/Controller/ViewController.php',
+    'OCA\\Files\\Db\\OpenLocalEditor' => $baseDir.'/../lib/Db/OpenLocalEditor.php',
+    'OCA\\Files\\Db\\OpenLocalEditorMapper' => $baseDir.'/../lib/Db/OpenLocalEditorMapper.php',
+    'OCA\\Files\\Db\\TransferOwnership' => $baseDir.'/../lib/Db/TransferOwnership.php',
+    'OCA\\Files\\Db\\TransferOwnershipMapper' => $baseDir.'/../lib/Db/TransferOwnershipMapper.php',
+    'OCA\\Files\\DirectEditingCapabilities' => $baseDir.'/../lib/DirectEditingCapabilities.php',
+    'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => $baseDir.'/../lib/Event/LoadAdditionalScriptsEvent.php',
+    'OCA\\Files\\Event\\LoadSidebar' => $baseDir.'/../lib/Event/LoadSidebar.php',
+    'OCA\\Files\\Exception\\TransferOwnershipException' => $baseDir.'/../lib/Exception/TransferOwnershipException.php',
+    'OCA\\Files\\Helper' => $baseDir.'/../lib/Helper.php',
+    'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => $baseDir.'/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
+    'OCA\\Files\\Listener\\LoadSidebarListener' => $baseDir.'/../lib/Listener/LoadSidebarListener.php',
+    'OCA\\Files\\Migration\\Version11301Date20191205150729' => $baseDir.'/../lib/Migration/Version11301Date20191205150729.php',
+    'OCA\\Files\\Migration\\Version12101Date20221011153334' => $baseDir.'/../lib/Migration/Version12101Date20221011153334.php',
+    'OCA\\Files\\Notification\\Notifier' => $baseDir.'/../lib/Notification/Notifier.php',
+    'OCA\\Files\\Search\\FilesSearchProvider' => $baseDir.'/../lib/Search/FilesSearchProvider.php',
+    'OCA\\Files\\Service\\DirectEditingService' => $baseDir.'/../lib/Service/DirectEditingService.php',
+    'OCA\\Files\\Service\\OwnershipTransferService' => $baseDir.'/../lib/Service/OwnershipTransferService.php',
+    'OCA\\Files\\Service\\TagService' => $baseDir.'/../lib/Service/TagService.php',
+    'OCA\\Files\\Service\\UserConfig' => $baseDir.'/../lib/Service/UserConfig.php',
+    'OCA\\Files\\Settings\\PersonalSettings' => $baseDir.'/../lib/Settings/PersonalSettings.php',
 );

apps/files/composer/composer/autoload_static.php

Spacing +60 added lines, -60 removed lines

@@ -6,79 +6,79 @@
 
 class ComposerStaticInitFiles
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Files\\' => 10,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Files\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__ . '/..' . '/../lib/Activity/FavoriteProvider.php',
-        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__ . '/..' . '/../lib/Activity/Filter/Favorites.php',
-        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__ . '/..' . '/../lib/Activity/Filter/FileChanges.php',
-        'OCA\\Files\\Activity\\Helper' => __DIR__ . '/..' . '/../lib/Activity/Helper.php',
-        'OCA\\Files\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
-        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
-        'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileActivitySettings.php',
-        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
-        'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavoriteChanged.php',
-        'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
-        'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
-        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',
-        'OCA\\Files\\BackgroundJob\\DeleteExpiredOpenLocalEditor' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteExpiredOpenLocalEditor.php',
-        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
-        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__ . '/..' . '/../lib/BackgroundJob/ScanFiles.php',
-        'OCA\\Files\\BackgroundJob\\TransferOwnership' => __DIR__ . '/..' . '/../lib/BackgroundJob/TransferOwnership.php',
-        'OCA\\Files\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Files\\Collaboration\\Resources\\Listener' => __DIR__ . '/..' . '/../lib/Collaboration/Resources/Listener.php',
-        'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => __DIR__ . '/..' . '/../lib/Collaboration/Resources/ResourceProvider.php',
-        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanedFiles.php',
-        'OCA\\Files\\Command\\RepairTree' => __DIR__ . '/..' . '/../lib/Command/RepairTree.php',
-        'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php',
-        'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php',
-        'OCA\\Files\\Command\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Command/TransferOwnership.php',
-        'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php',
-        'OCA\\Files\\Controller\\DirectEditingController' => __DIR__ . '/..' . '/../lib/Controller/DirectEditingController.php',
-        'OCA\\Files\\Controller\\DirectEditingViewController' => __DIR__ . '/..' . '/../lib/Controller/DirectEditingViewController.php',
-        'OCA\\Files\\Controller\\OpenLocalEditorController' => __DIR__ . '/..' . '/../lib/Controller/OpenLocalEditorController.php',
-        'OCA\\Files\\Controller\\TemplateController' => __DIR__ . '/..' . '/../lib/Controller/TemplateController.php',
-        'OCA\\Files\\Controller\\TransferOwnershipController' => __DIR__ . '/..' . '/../lib/Controller/TransferOwnershipController.php',
-        'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php',
-        'OCA\\Files\\Db\\OpenLocalEditor' => __DIR__ . '/..' . '/../lib/Db/OpenLocalEditor.php',
-        'OCA\\Files\\Db\\OpenLocalEditorMapper' => __DIR__ . '/..' . '/../lib/Db/OpenLocalEditorMapper.php',
-        'OCA\\Files\\Db\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Db/TransferOwnership.php',
-        'OCA\\Files\\Db\\TransferOwnershipMapper' => __DIR__ . '/..' . '/../lib/Db/TransferOwnershipMapper.php',
-        'OCA\\Files\\DirectEditingCapabilities' => __DIR__ . '/..' . '/../lib/DirectEditingCapabilities.php',
-        'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => __DIR__ . '/..' . '/../lib/Event/LoadAdditionalScriptsEvent.php',
-        'OCA\\Files\\Event\\LoadSidebar' => __DIR__ . '/..' . '/../lib/Event/LoadSidebar.php',
-        'OCA\\Files\\Exception\\TransferOwnershipException' => __DIR__ . '/..' . '/../lib/Exception/TransferOwnershipException.php',
-        'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
-        'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => __DIR__ . '/..' . '/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
-        'OCA\\Files\\Listener\\LoadSidebarListener' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarListener.php',
-        'OCA\\Files\\Migration\\Version11301Date20191205150729' => __DIR__ . '/..' . '/../lib/Migration/Version11301Date20191205150729.php',
-        'OCA\\Files\\Migration\\Version12101Date20221011153334' => __DIR__ . '/..' . '/../lib/Migration/Version12101Date20221011153334.php',
-        'OCA\\Files\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
-        'OCA\\Files\\Search\\FilesSearchProvider' => __DIR__ . '/..' . '/../lib/Search/FilesSearchProvider.php',
-        'OCA\\Files\\Service\\DirectEditingService' => __DIR__ . '/..' . '/../lib/Service/DirectEditingService.php',
-        'OCA\\Files\\Service\\OwnershipTransferService' => __DIR__ . '/..' . '/../lib/Service/OwnershipTransferService.php',
-        'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
-        'OCA\\Files\\Service\\UserConfig' => __DIR__ . '/..' . '/../lib/Service/UserConfig.php',
-        'OCA\\Files\\Settings\\PersonalSettings' => __DIR__ . '/..' . '/../lib/Settings/PersonalSettings.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__.'/..'.'/../lib/Activity/FavoriteProvider.php',
+        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__.'/..'.'/../lib/Activity/Filter/Favorites.php',
+        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__.'/..'.'/../lib/Activity/Filter/FileChanges.php',
+        'OCA\\Files\\Activity\\Helper' => __DIR__.'/..'.'/../lib/Activity/Helper.php',
+        'OCA\\Files\\Activity\\Provider' => __DIR__.'/..'.'/../lib/Activity/Provider.php',
+        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__.'/..'.'/../lib/Activity/Settings/FavoriteAction.php',
+        'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__.'/..'.'/../lib/Activity/Settings/FileActivitySettings.php',
+        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__.'/..'.'/../lib/Activity/Settings/FileChanged.php',
+        'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => __DIR__.'/..'.'/../lib/Activity/Settings/FileFavoriteChanged.php',
+        'OCA\\Files\\App' => __DIR__.'/..'.'/../lib/App.php',
+        'OCA\\Files\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
+        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupFileLocks.php',
+        'OCA\\Files\\BackgroundJob\\DeleteExpiredOpenLocalEditor' => __DIR__.'/..'.'/../lib/BackgroundJob/DeleteExpiredOpenLocalEditor.php',
+        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__.'/..'.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
+        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__.'/..'.'/../lib/BackgroundJob/ScanFiles.php',
+        'OCA\\Files\\BackgroundJob\\TransferOwnership' => __DIR__.'/..'.'/../lib/BackgroundJob/TransferOwnership.php',
+        'OCA\\Files\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Files\\Collaboration\\Resources\\Listener' => __DIR__.'/..'.'/../lib/Collaboration/Resources/Listener.php',
+        'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => __DIR__.'/..'.'/../lib/Collaboration/Resources/ResourceProvider.php',
+        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__.'/..'.'/../lib/Command/DeleteOrphanedFiles.php',
+        'OCA\\Files\\Command\\RepairTree' => __DIR__.'/..'.'/../lib/Command/RepairTree.php',
+        'OCA\\Files\\Command\\Scan' => __DIR__.'/..'.'/../lib/Command/Scan.php',
+        'OCA\\Files\\Command\\ScanAppData' => __DIR__.'/..'.'/../lib/Command/ScanAppData.php',
+        'OCA\\Files\\Command\\TransferOwnership' => __DIR__.'/..'.'/../lib/Command/TransferOwnership.php',
+        'OCA\\Files\\Controller\\ApiController' => __DIR__.'/..'.'/../lib/Controller/ApiController.php',
+        'OCA\\Files\\Controller\\DirectEditingController' => __DIR__.'/..'.'/../lib/Controller/DirectEditingController.php',
+        'OCA\\Files\\Controller\\DirectEditingViewController' => __DIR__.'/..'.'/../lib/Controller/DirectEditingViewController.php',
+        'OCA\\Files\\Controller\\OpenLocalEditorController' => __DIR__.'/..'.'/../lib/Controller/OpenLocalEditorController.php',
+        'OCA\\Files\\Controller\\TemplateController' => __DIR__.'/..'.'/../lib/Controller/TemplateController.php',
+        'OCA\\Files\\Controller\\TransferOwnershipController' => __DIR__.'/..'.'/../lib/Controller/TransferOwnershipController.php',
+        'OCA\\Files\\Controller\\ViewController' => __DIR__.'/..'.'/../lib/Controller/ViewController.php',
+        'OCA\\Files\\Db\\OpenLocalEditor' => __DIR__.'/..'.'/../lib/Db/OpenLocalEditor.php',
+        'OCA\\Files\\Db\\OpenLocalEditorMapper' => __DIR__.'/..'.'/../lib/Db/OpenLocalEditorMapper.php',
+        'OCA\\Files\\Db\\TransferOwnership' => __DIR__.'/..'.'/../lib/Db/TransferOwnership.php',
+        'OCA\\Files\\Db\\TransferOwnershipMapper' => __DIR__.'/..'.'/../lib/Db/TransferOwnershipMapper.php',
+        'OCA\\Files\\DirectEditingCapabilities' => __DIR__.'/..'.'/../lib/DirectEditingCapabilities.php',
+        'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => __DIR__.'/..'.'/../lib/Event/LoadAdditionalScriptsEvent.php',
+        'OCA\\Files\\Event\\LoadSidebar' => __DIR__.'/..'.'/../lib/Event/LoadSidebar.php',
+        'OCA\\Files\\Exception\\TransferOwnershipException' => __DIR__.'/..'.'/../lib/Exception/TransferOwnershipException.php',
+        'OCA\\Files\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
+        'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => __DIR__.'/..'.'/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
+        'OCA\\Files\\Listener\\LoadSidebarListener' => __DIR__.'/..'.'/../lib/Listener/LoadSidebarListener.php',
+        'OCA\\Files\\Migration\\Version11301Date20191205150729' => __DIR__.'/..'.'/../lib/Migration/Version11301Date20191205150729.php',
+        'OCA\\Files\\Migration\\Version12101Date20221011153334' => __DIR__.'/..'.'/../lib/Migration/Version12101Date20221011153334.php',
+        'OCA\\Files\\Notification\\Notifier' => __DIR__.'/..'.'/../lib/Notification/Notifier.php',
+        'OCA\\Files\\Search\\FilesSearchProvider' => __DIR__.'/..'.'/../lib/Search/FilesSearchProvider.php',
+        'OCA\\Files\\Service\\DirectEditingService' => __DIR__.'/..'.'/../lib/Service/DirectEditingService.php',
+        'OCA\\Files\\Service\\OwnershipTransferService' => __DIR__.'/..'.'/../lib/Service/OwnershipTransferService.php',
+        'OCA\\Files\\Service\\TagService' => __DIR__.'/..'.'/../lib/Service/TagService.php',
+        'OCA\\Files\\Service\\UserConfig' => __DIR__.'/..'.'/../lib/Service/UserConfig.php',
+        'OCA\\Files\\Settings\\PersonalSettings' => __DIR__.'/..'.'/../lib/Settings/PersonalSettings.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFiles::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFiles::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFiles::$classMap;

lib/private/legacy/OC_Helper.php

Indentation +573 added lines, -573 removed lines

@@ -55,577 +55,577 @@
  * Collection of useful functions
  */
 class OC_Helper {
-	private static $templateManager;
-
-	/**
-	 * Make a human file size
-	 * @param int $bytes file size in bytes
-	 * @return string a human readable file size
-	 *
-	 * Makes 2048 to 2 kB.
-	 */
-	public static function humanFileSize($bytes) {
-		if ($bytes < 0) {
-			return "?";
-		}
-		if ($bytes < 1024) {
-			return "$bytes B";
-		}
-		$bytes = round($bytes / 1024, 0);
-		if ($bytes < 1024) {
-			return "$bytes KB";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return "$bytes MB";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return "$bytes GB";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return "$bytes TB";
-		}
-
-		$bytes = round($bytes / 1024, 1);
-		return "$bytes PB";
-	}
-
-	/**
-	 * Make a computer file size
-	 * @param string $str file size in human readable format
-	 * @return int|false a file size in bytes
-	 *
-	 * Makes 2kB to 2048.
-	 *
-	 * Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
-	 */
-	public static function computerFileSize($str) {
-		$str = strtolower($str);
-		if (is_numeric($str)) {
-			return (int)$str;
-		}
-
-		$bytes_array = [
-			'b' => 1,
-			'k' => 1024,
-			'kb' => 1024,
-			'mb' => 1024 * 1024,
-			'm' => 1024 * 1024,
-			'gb' => 1024 * 1024 * 1024,
-			'g' => 1024 * 1024 * 1024,
-			'tb' => 1024 * 1024 * 1024 * 1024,
-			't' => 1024 * 1024 * 1024 * 1024,
-			'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
-			'p' => 1024 * 1024 * 1024 * 1024 * 1024,
-		];
-
-		$bytes = (float)$str;
-
-		if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
-			$bytes *= $bytes_array[$matches[1]];
-		} else {
-			return false;
-		}
-
-		$bytes = round($bytes);
-
-		return (int)$bytes;
-	}
-
-	/**
-	 * Recursive copying of folders
-	 * @param string $src source folder
-	 * @param string $dest target folder
-	 *
-	 */
-	public static function copyr($src, $dest) {
-		if (is_dir($src)) {
-			if (!is_dir($dest)) {
-				mkdir($dest);
-			}
-			$files = scandir($src);
-			foreach ($files as $file) {
-				if ($file != "." && $file != "..") {
-					self::copyr("$src/$file", "$dest/$file");
-				}
-			}
-		} elseif (file_exists($src) && !\OC\Files\Filesystem::isFileBlacklisted($src)) {
-			copy($src, $dest);
-		}
-	}
-
-	/**
-	 * Recursive deletion of folders
-	 * @param string $dir path to the folder
-	 * @param bool $deleteSelf if set to false only the content of the folder will be deleted
-	 * @return bool
-	 */
-	public static function rmdirr($dir, $deleteSelf = true) {
-		if (is_dir($dir)) {
-			$files = new RecursiveIteratorIterator(
-				new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS),
-				RecursiveIteratorIterator::CHILD_FIRST
-			);
-
-			foreach ($files as $fileInfo) {
-				/** @var SplFileInfo $fileInfo */
-				if ($fileInfo->isLink()) {
-					unlink($fileInfo->getPathname());
-				} elseif ($fileInfo->isDir()) {
-					rmdir($fileInfo->getRealPath());
-				} else {
-					unlink($fileInfo->getRealPath());
-				}
-			}
-			if ($deleteSelf) {
-				rmdir($dir);
-			}
-		} elseif (file_exists($dir)) {
-			if ($deleteSelf) {
-				unlink($dir);
-			}
-		}
-		if (!$deleteSelf) {
-			return true;
-		}
-
-		return !file_exists($dir);
-	}
-
-	/**
-	 * @deprecated 18.0.0
-	 * @return \OC\Files\Type\TemplateManager
-	 */
-	public static function getFileTemplateManager() {
-		if (!self::$templateManager) {
-			self::$templateManager = new \OC\Files\Type\TemplateManager();
-		}
-		return self::$templateManager;
-	}
-
-	/**
-	 * detect if a given program is found in the search PATH
-	 *
-	 * @param string $name
-	 * @param bool $path
-	 * @internal param string $program name
-	 * @internal param string $optional search path, defaults to $PATH
-	 * @return bool    true if executable program found in path
-	 */
-	public static function canExecute($name, $path = false) {
-		// path defaults to PATH from environment if not set
-		if ($path === false) {
-			$path = getenv("PATH");
-		}
-		// we look for an executable file of that name
-		$exts = [""];
-		$check_fn = "is_executable";
-		// Default check will be done with $path directories :
-		$dirs = explode(PATH_SEPARATOR, $path);
-		// WARNING : We have to check if open_basedir is enabled :
-		$obd = OC::$server->get(IniGetWrapper::class)->getString('open_basedir');
-		if ($obd != "none") {
-			$obd_values = explode(PATH_SEPARATOR, $obd);
-			if (count($obd_values) > 0 and $obd_values[0]) {
-				// open_basedir is in effect !
-				// We need to check if the program is in one of these dirs :
-				$dirs = $obd_values;
-			}
-		}
-		foreach ($dirs as $dir) {
-			foreach ($exts as $ext) {
-				if ($check_fn("$dir/$name" . $ext)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * copy the contents of one stream to another
-	 *
-	 * @param resource $source
-	 * @param resource $target
-	 * @return array the number of bytes copied and result
-	 */
-	public static function streamCopy($source, $target) {
-		if (!$source or !$target) {
-			return [0, false];
-		}
-		$bufSize = 8192;
-		$result = true;
-		$count = 0;
-		while (!feof($source)) {
-			$buf = fread($source, $bufSize);
-			$bytesWritten = fwrite($target, $buf);
-			if ($bytesWritten !== false) {
-				$count += $bytesWritten;
-			}
-			// note: strlen is expensive so only use it when necessary,
-			// on the last block
-			if ($bytesWritten === false
-				|| ($bytesWritten < $bufSize && $bytesWritten < strlen($buf))
-			) {
-				// write error, could be disk full ?
-				$result = false;
-				break;
-			}
-		}
-		return [$count, $result];
-	}
-
-	/**
-	 * Adds a suffix to the name in case the file exists
-	 *
-	 * @param string $path
-	 * @param string $filename
-	 * @return string
-	 */
-	public static function buildNotExistingFileName($path, $filename) {
-		$view = \OC\Files\Filesystem::getView();
-		return self::buildNotExistingFileNameForView($path, $filename, $view);
-	}
-
-	/**
-	 * Adds a suffix to the name in case the file exists
-	 *
-	 * @param string $path
-	 * @param string $filename
-	 * @return string
-	 */
-	public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) {
-		if ($path === '/') {
-			$path = '';
-		}
-		if ($pos = strrpos($filename, '.')) {
-			$name = substr($filename, 0, $pos);
-			$ext = substr($filename, $pos);
-		} else {
-			$name = $filename;
-			$ext = '';
-		}
-
-		$newpath = $path . '/' . $filename;
-		if ($view->file_exists($newpath)) {
-			if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
-				//Replace the last "(number)" with "(number+1)"
-				$last_match = count($matches[0]) - 1;
-				$counter = $matches[1][$last_match][0] + 1;
-				$offset = $matches[0][$last_match][1];
-				$match_length = strlen($matches[0][$last_match][0]);
-			} else {
-				$counter = 2;
-				$match_length = 0;
-				$offset = false;
-			}
-			do {
-				if ($offset) {
-					//Replace the last "(number)" with "(number+1)"
-					$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
-				} else {
-					$newname = $name . ' (' . $counter . ')';
-				}
-				$newpath = $path . '/' . $newname . $ext;
-				$counter++;
-			} while ($view->file_exists($newpath));
-		}
-
-		return $newpath;
-	}
-
-	/**
-	 * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
-	 *
-	 * @param array $input The array to work on
-	 * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
-	 * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
-	 * @return array
-	 *
-	 * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
-	 * based on https://www.php.net/manual/en/function.array-change-key-case.php#107715
-	 *
-	 */
-	public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
-		$case = ($case != MB_CASE_UPPER) ? MB_CASE_LOWER : MB_CASE_UPPER;
-		$ret = [];
-		foreach ($input as $k => $v) {
-			$ret[mb_convert_case($k, $case, $encoding)] = $v;
-		}
-		return $ret;
-	}
-
-	/**
-	 * performs a search in a nested array
-	 * @param array $haystack the array to be searched
-	 * @param string $needle the search string
-	 * @param mixed $index optional, only search this key name
-	 * @return mixed the key of the matching field, otherwise false
-	 *
-	 * performs a search in a nested array
-	 *
-	 * taken from https://www.php.net/manual/en/function.array-search.php#97645
-	 */
-	public static function recursiveArraySearch($haystack, $needle, $index = null) {
-		$aIt = new RecursiveArrayIterator($haystack);
-		$it = new RecursiveIteratorIterator($aIt);
-
-		while ($it->valid()) {
-			if (((isset($index) and ($it->key() == $index)) or !isset($index)) and ($it->current() == $needle)) {
-				return $aIt->key();
-			}
-
-			$it->next();
-		}
-
-		return false;
-	}
-
-	/**
-	 * calculates the maximum upload size respecting system settings, free space and user quota
-	 *
-	 * @param string $dir the current folder where the user currently operates
-	 * @param int $freeSpace the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
-	 * @return int number of bytes representing
-	 */
-	public static function maxUploadFilesize($dir, $freeSpace = null) {
-		if (is_null($freeSpace) || $freeSpace < 0) {
-			$freeSpace = self::freeSpace($dir);
-		}
-		return min($freeSpace, self::uploadLimit());
-	}
-
-	/**
-	 * Calculate free space left within user quota
-	 *
-	 * @param string $dir the current folder where the user currently operates
-	 * @return int number of bytes representing
-	 */
-	public static function freeSpace($dir) {
-		$freeSpace = \OC\Files\Filesystem::free_space($dir);
-		if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			$freeSpace = max($freeSpace, 0);
-			return $freeSpace;
-		} else {
-			return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
-		}
-	}
-
-	/**
-	 * Calculate PHP upload limit
-	 *
-	 * @return int PHP upload file size limit
-	 */
-	public static function uploadLimit() {
-		$ini = \OC::$server->get(IniGetWrapper::class);
-		$upload_max_filesize = (int)OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
-		$post_max_size = (int)OCP\Util::computerFileSize($ini->get('post_max_size'));
-		if ($upload_max_filesize === 0 && $post_max_size === 0) {
-			return INF;
-		} elseif ($upload_max_filesize === 0 || $post_max_size === 0) {
-			return max($upload_max_filesize, $post_max_size); //only the non 0 value counts
-		} else {
-			return min($upload_max_filesize, $post_max_size);
-		}
-	}
-
-	/**
-	 * Checks if a function is available
-	 *
-	 * @deprecated Since 25.0.0 use \OCP\Util::isFunctionEnabled instead
-	 */
-	public static function is_function_enabled(string $function_name): bool {
-		return \OCP\Util::isFunctionEnabled($function_name);
-	}
-
-	/**
-	 * Try to find a program
-	 * @deprecated Since 25.0.0 Use \OC\BinaryFinder directly
-	 */
-	public static function findBinaryPath(string $program): ?string {
-		$result = \OCP\Server::get(IBinaryFinder::class)->findBinaryPath($program);
-		return $result !== false ? $result : null;
-	}
-
-	/**
-	 * Calculate the disc space for the given path
-	 *
-	 * BEWARE: this requires that Util::setupFS() was called
-	 * already !
-	 *
-	 * @param string $path
-	 * @param \OCP\Files\FileInfo $rootInfo (optional)
-	 * @param bool $includeMountPoints whether to include mount points in the size calculation
-	 * @param bool $useCache whether to use the cached quota values
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public static function getStorageInfo($path, $rootInfo = null, $includeMountPoints = true, $useCache = true) {
-		/** @var ICacheFactory $cacheFactory */
-		$cacheFactory = \OC::$server->get(ICacheFactory::class);
-		$memcache = $cacheFactory->createLocal('storage_info');
-
-		// return storage info without adding mount points
-		$includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
-
-		$view = Filesystem::getView();
-		if (!$view) {
-			throw new \OCP\Files\NotFoundException();
-		}
-		$fullPath = $view->getAbsolutePath($path);
-
-		$cacheKey = $fullPath. '::' . ($includeMountPoints ? 'include' : 'exclude');
-		if ($useCache) {
-			$cached = $memcache->get($cacheKey);
-			if ($cached) {
-				return $cached;
-			}
-		}
-
-		if (!$rootInfo) {
-			$rootInfo = \OC\Files\Filesystem::getFileInfo($path, $includeExtStorage ? 'ext' : false);
-		}
-		if (!$rootInfo instanceof \OCP\Files\FileInfo) {
-			throw new \OCP\Files\NotFoundException();
-		}
-		$used = $rootInfo->getSize($includeMountPoints);
-		if ($used < 0) {
-			$used = 0;
-		}
-		$quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
-		$mount = $rootInfo->getMountPoint();
-		$storage = $mount->getStorage();
-		$sourceStorage = $storage;
-		if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-			$includeExtStorage = false;
-		}
-		if ($includeExtStorage) {
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
-				|| $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
-			) {
-				/** @var \OC\Files\Storage\Home $storage */
-				$user = $storage->getUser();
-			} else {
-				$user = \OC::$server->getUserSession()->getUser();
-			}
-			$quota = OC_Util::getUserQuota($user);
-			if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-				// always get free space / total space from root + mount points
-				return self::getGlobalStorageInfo($quota, $user, $mount);
-			}
-		}
-
-		// TODO: need a better way to get total space from storage
-		if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota')) {
-			/** @var \OC\Files\Storage\Wrapper\Quota $storage */
-			$quota = $sourceStorage->getQuota();
-		}
-		try {
-			$free = $sourceStorage->free_space($rootInfo->getInternalPath());
-		} catch (\Exception $e) {
-			if ($path === "") {
-				throw $e;
-			}
-			/** @var LoggerInterface $logger */
-			$logger = \OC::$server->get(LoggerInterface::class);
-			$logger->warning("Error while getting quota info, using root quota", ['exception' => $e]);
-			$rootInfo = self::getStorageInfo("");
-			$memcache->set($cacheKey, $rootInfo, 5 * 60);
-			return $rootInfo;
-		}
-		if ($free >= 0) {
-			$total = $free + $used;
-		} else {
-			$total = $free; //either unknown or unlimited
-		}
-		if ($total > 0) {
-			if ($quota > 0 && $total > $quota) {
-				$total = $quota;
-			}
-			// prevent division by zero or error codes (negative values)
-			$relative = round(($used / $total) * 10000) / 100;
-		} else {
-			$relative = 0;
-		}
-
-		$ownerId = $storage->getOwner($path);
-		$ownerDisplayName = '';
-		if ($ownerId) {
-			$ownerDisplayName = \OC::$server->getUserManager()->getDisplayName($ownerId) ?? '';
-		}
-
-		if (substr_count($mount->getMountPoint(), '/') < 3) {
-			$mountPoint = '';
-		} else {
-			[,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
-		}
-
-		$info = [
-			'free' => $free,
-			'used' => $used,
-			'quota' => $quota,
-			'total' => $total,
-			'relative' => $relative,
-			'owner' => $ownerId,
-			'ownerDisplayName' => $ownerDisplayName,
-			'mountType' => $mount->getMountType(),
-			'mountPoint' => trim($mountPoint, '/'),
-		];
-
-		$memcache->set($cacheKey, $info, 5 * 60);
-
-		return $info;
-	}
-
-	/**
-	 * Get storage info including all mount points and quota
-	 */
-	private static function getGlobalStorageInfo(int $quota, IUser $user, IMountPoint $mount): array {
-		$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
-		$used = $rootInfo['size'];
-		if ($used < 0) {
-			$used = 0;
-		}
-
-		$total = $quota;
-		$free = $quota - $used;
-
-		if ($total > 0) {
-			if ($quota > 0 && $total > $quota) {
-				$total = $quota;
-			}
-			// prevent division by zero or error codes (negative values)
-			$relative = round(($used / $total) * 10000) / 100;
-		} else {
-			$relative = 0;
-		}
-
-		if (substr_count($mount->getMountPoint(), '/') < 3) {
-			$mountPoint = '';
-		} else {
-			[,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
-		}
-
-		return [
-			'free' => $free,
-			'used' => $used,
-			'total' => $total,
-			'relative' => $relative,
-			'quota' => $quota,
-			'owner' => $user->getUID(),
-			'ownerDisplayName' => $user->getDisplayName(),
-			'mountType' => $mount->getMountType(),
-			'mountPoint' => trim($mountPoint, '/'),
-		];
-	}
-
-	/**
-	 * Returns whether the config file is set manually to read-only
-	 * @return bool
-	 */
-	public static function isReadOnlyConfigEnabled() {
-		return \OC::$server->getConfig()->getSystemValue('config_is_read_only', false);
-	}
+    private static $templateManager;
+
+    /**
+     * Make a human file size
+     * @param int $bytes file size in bytes
+     * @return string a human readable file size
+     *
+     * Makes 2048 to 2 kB.
+     */
+    public static function humanFileSize($bytes) {
+        if ($bytes < 0) {
+            return "?";
+        }
+        if ($bytes < 1024) {
+            return "$bytes B";
+        }
+        $bytes = round($bytes / 1024, 0);
+        if ($bytes < 1024) {
+            return "$bytes KB";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return "$bytes MB";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return "$bytes GB";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return "$bytes TB";
+        }
+
+        $bytes = round($bytes / 1024, 1);
+        return "$bytes PB";
+    }
+
+    /**
+     * Make a computer file size
+     * @param string $str file size in human readable format
+     * @return int|false a file size in bytes
+     *
+     * Makes 2kB to 2048.
+     *
+     * Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
+     */
+    public static function computerFileSize($str) {
+        $str = strtolower($str);
+        if (is_numeric($str)) {
+            return (int)$str;
+        }
+
+        $bytes_array = [
+            'b' => 1,
+            'k' => 1024,
+            'kb' => 1024,
+            'mb' => 1024 * 1024,
+            'm' => 1024 * 1024,
+            'gb' => 1024 * 1024 * 1024,
+            'g' => 1024 * 1024 * 1024,
+            'tb' => 1024 * 1024 * 1024 * 1024,
+            't' => 1024 * 1024 * 1024 * 1024,
+            'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
+            'p' => 1024 * 1024 * 1024 * 1024 * 1024,
+        ];
+
+        $bytes = (float)$str;
+
+        if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
+            $bytes *= $bytes_array[$matches[1]];
+        } else {
+            return false;
+        }
+
+        $bytes = round($bytes);
+
+        return (int)$bytes;
+    }
+
+    /**
+     * Recursive copying of folders
+     * @param string $src source folder
+     * @param string $dest target folder
+     *
+     */
+    public static function copyr($src, $dest) {
+        if (is_dir($src)) {
+            if (!is_dir($dest)) {
+                mkdir($dest);
+            }
+            $files = scandir($src);
+            foreach ($files as $file) {
+                if ($file != "." && $file != "..") {
+                    self::copyr("$src/$file", "$dest/$file");
+                }
+            }
+        } elseif (file_exists($src) && !\OC\Files\Filesystem::isFileBlacklisted($src)) {
+            copy($src, $dest);
+        }
+    }
+
+    /**
+     * Recursive deletion of folders
+     * @param string $dir path to the folder
+     * @param bool $deleteSelf if set to false only the content of the folder will be deleted
+     * @return bool
+     */
+    public static function rmdirr($dir, $deleteSelf = true) {
+        if (is_dir($dir)) {
+            $files = new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS),
+                RecursiveIteratorIterator::CHILD_FIRST
+            );
+
+            foreach ($files as $fileInfo) {
+                /** @var SplFileInfo $fileInfo */
+                if ($fileInfo->isLink()) {
+                    unlink($fileInfo->getPathname());
+                } elseif ($fileInfo->isDir()) {
+                    rmdir($fileInfo->getRealPath());
+                } else {
+                    unlink($fileInfo->getRealPath());
+                }
+            }
+            if ($deleteSelf) {
+                rmdir($dir);
+            }
+        } elseif (file_exists($dir)) {
+            if ($deleteSelf) {
+                unlink($dir);
+            }
+        }
+        if (!$deleteSelf) {
+            return true;
+        }
+
+        return !file_exists($dir);
+    }
+
+    /**
+     * @deprecated 18.0.0
+     * @return \OC\Files\Type\TemplateManager
+     */
+    public static function getFileTemplateManager() {
+        if (!self::$templateManager) {
+            self::$templateManager = new \OC\Files\Type\TemplateManager();
+        }
+        return self::$templateManager;
+    }
+
+    /**
+     * detect if a given program is found in the search PATH
+     *
+     * @param string $name
+     * @param bool $path
+     * @internal param string $program name
+     * @internal param string $optional search path, defaults to $PATH
+     * @return bool    true if executable program found in path
+     */
+    public static function canExecute($name, $path = false) {
+        // path defaults to PATH from environment if not set
+        if ($path === false) {
+            $path = getenv("PATH");
+        }
+        // we look for an executable file of that name
+        $exts = [""];
+        $check_fn = "is_executable";
+        // Default check will be done with $path directories :
+        $dirs = explode(PATH_SEPARATOR, $path);
+        // WARNING : We have to check if open_basedir is enabled :
+        $obd = OC::$server->get(IniGetWrapper::class)->getString('open_basedir');
+        if ($obd != "none") {
+            $obd_values = explode(PATH_SEPARATOR, $obd);
+            if (count($obd_values) > 0 and $obd_values[0]) {
+                // open_basedir is in effect !
+                // We need to check if the program is in one of these dirs :
+                $dirs = $obd_values;
+            }
+        }
+        foreach ($dirs as $dir) {
+            foreach ($exts as $ext) {
+                if ($check_fn("$dir/$name" . $ext)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * copy the contents of one stream to another
+     *
+     * @param resource $source
+     * @param resource $target
+     * @return array the number of bytes copied and result
+     */
+    public static function streamCopy($source, $target) {
+        if (!$source or !$target) {
+            return [0, false];
+        }
+        $bufSize = 8192;
+        $result = true;
+        $count = 0;
+        while (!feof($source)) {
+            $buf = fread($source, $bufSize);
+            $bytesWritten = fwrite($target, $buf);
+            if ($bytesWritten !== false) {
+                $count += $bytesWritten;
+            }
+            // note: strlen is expensive so only use it when necessary,
+            // on the last block
+            if ($bytesWritten === false
+                || ($bytesWritten < $bufSize && $bytesWritten < strlen($buf))
+            ) {
+                // write error, could be disk full ?
+                $result = false;
+                break;
+            }
+        }
+        return [$count, $result];
+    }
+
+    /**
+     * Adds a suffix to the name in case the file exists
+     *
+     * @param string $path
+     * @param string $filename
+     * @return string
+     */
+    public static function buildNotExistingFileName($path, $filename) {
+        $view = \OC\Files\Filesystem::getView();
+        return self::buildNotExistingFileNameForView($path, $filename, $view);
+    }
+
+    /**
+     * Adds a suffix to the name in case the file exists
+     *
+     * @param string $path
+     * @param string $filename
+     * @return string
+     */
+    public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) {
+        if ($path === '/') {
+            $path = '';
+        }
+        if ($pos = strrpos($filename, '.')) {
+            $name = substr($filename, 0, $pos);
+            $ext = substr($filename, $pos);
+        } else {
+            $name = $filename;
+            $ext = '';
+        }
+
+        $newpath = $path . '/' . $filename;
+        if ($view->file_exists($newpath)) {
+            if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
+                //Replace the last "(number)" with "(number+1)"
+                $last_match = count($matches[0]) - 1;
+                $counter = $matches[1][$last_match][0] + 1;
+                $offset = $matches[0][$last_match][1];
+                $match_length = strlen($matches[0][$last_match][0]);
+            } else {
+                $counter = 2;
+                $match_length = 0;
+                $offset = false;
+            }
+            do {
+                if ($offset) {
+                    //Replace the last "(number)" with "(number+1)"
+                    $newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
+                } else {
+                    $newname = $name . ' (' . $counter . ')';
+                }
+                $newpath = $path . '/' . $newname . $ext;
+                $counter++;
+            } while ($view->file_exists($newpath));
+        }
+
+        return $newpath;
+    }
+
+    /**
+     * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+     *
+     * @param array $input The array to work on
+     * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
+     * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+     * @return array
+     *
+     * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+     * based on https://www.php.net/manual/en/function.array-change-key-case.php#107715
+     *
+     */
+    public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
+        $case = ($case != MB_CASE_UPPER) ? MB_CASE_LOWER : MB_CASE_UPPER;
+        $ret = [];
+        foreach ($input as $k => $v) {
+            $ret[mb_convert_case($k, $case, $encoding)] = $v;
+        }
+        return $ret;
+    }
+
+    /**
+     * performs a search in a nested array
+     * @param array $haystack the array to be searched
+     * @param string $needle the search string
+     * @param mixed $index optional, only search this key name
+     * @return mixed the key of the matching field, otherwise false
+     *
+     * performs a search in a nested array
+     *
+     * taken from https://www.php.net/manual/en/function.array-search.php#97645
+     */
+    public static function recursiveArraySearch($haystack, $needle, $index = null) {
+        $aIt = new RecursiveArrayIterator($haystack);
+        $it = new RecursiveIteratorIterator($aIt);
+
+        while ($it->valid()) {
+            if (((isset($index) and ($it->key() == $index)) or !isset($index)) and ($it->current() == $needle)) {
+                return $aIt->key();
+            }
+
+            $it->next();
+        }
+
+        return false;
+    }
+
+    /**
+     * calculates the maximum upload size respecting system settings, free space and user quota
+     *
+     * @param string $dir the current folder where the user currently operates
+     * @param int $freeSpace the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
+     * @return int number of bytes representing
+     */
+    public static function maxUploadFilesize($dir, $freeSpace = null) {
+        if (is_null($freeSpace) || $freeSpace < 0) {
+            $freeSpace = self::freeSpace($dir);
+        }
+        return min($freeSpace, self::uploadLimit());
+    }
+
+    /**
+     * Calculate free space left within user quota
+     *
+     * @param string $dir the current folder where the user currently operates
+     * @return int number of bytes representing
+     */
+    public static function freeSpace($dir) {
+        $freeSpace = \OC\Files\Filesystem::free_space($dir);
+        if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+            $freeSpace = max($freeSpace, 0);
+            return $freeSpace;
+        } else {
+            return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+        }
+    }
+
+    /**
+     * Calculate PHP upload limit
+     *
+     * @return int PHP upload file size limit
+     */
+    public static function uploadLimit() {
+        $ini = \OC::$server->get(IniGetWrapper::class);
+        $upload_max_filesize = (int)OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
+        $post_max_size = (int)OCP\Util::computerFileSize($ini->get('post_max_size'));
+        if ($upload_max_filesize === 0 && $post_max_size === 0) {
+            return INF;
+        } elseif ($upload_max_filesize === 0 || $post_max_size === 0) {
+            return max($upload_max_filesize, $post_max_size); //only the non 0 value counts
+        } else {
+            return min($upload_max_filesize, $post_max_size);
+        }
+    }
+
+    /**
+     * Checks if a function is available
+     *
+     * @deprecated Since 25.0.0 use \OCP\Util::isFunctionEnabled instead
+     */
+    public static function is_function_enabled(string $function_name): bool {
+        return \OCP\Util::isFunctionEnabled($function_name);
+    }
+
+    /**
+     * Try to find a program
+     * @deprecated Since 25.0.0 Use \OC\BinaryFinder directly
+     */
+    public static function findBinaryPath(string $program): ?string {
+        $result = \OCP\Server::get(IBinaryFinder::class)->findBinaryPath($program);
+        return $result !== false ? $result : null;
+    }
+
+    /**
+     * Calculate the disc space for the given path
+     *
+     * BEWARE: this requires that Util::setupFS() was called
+     * already !
+     *
+     * @param string $path
+     * @param \OCP\Files\FileInfo $rootInfo (optional)
+     * @param bool $includeMountPoints whether to include mount points in the size calculation
+     * @param bool $useCache whether to use the cached quota values
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    public static function getStorageInfo($path, $rootInfo = null, $includeMountPoints = true, $useCache = true) {
+        /** @var ICacheFactory $cacheFactory */
+        $cacheFactory = \OC::$server->get(ICacheFactory::class);
+        $memcache = $cacheFactory->createLocal('storage_info');
+
+        // return storage info without adding mount points
+        $includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
+
+        $view = Filesystem::getView();
+        if (!$view) {
+            throw new \OCP\Files\NotFoundException();
+        }
+        $fullPath = $view->getAbsolutePath($path);
+
+        $cacheKey = $fullPath. '::' . ($includeMountPoints ? 'include' : 'exclude');
+        if ($useCache) {
+            $cached = $memcache->get($cacheKey);
+            if ($cached) {
+                return $cached;
+            }
+        }
+
+        if (!$rootInfo) {
+            $rootInfo = \OC\Files\Filesystem::getFileInfo($path, $includeExtStorage ? 'ext' : false);
+        }
+        if (!$rootInfo instanceof \OCP\Files\FileInfo) {
+            throw new \OCP\Files\NotFoundException();
+        }
+        $used = $rootInfo->getSize($includeMountPoints);
+        if ($used < 0) {
+            $used = 0;
+        }
+        $quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
+        $mount = $rootInfo->getMountPoint();
+        $storage = $mount->getStorage();
+        $sourceStorage = $storage;
+        if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
+            $includeExtStorage = false;
+        }
+        if ($includeExtStorage) {
+            if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
+                || $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
+            ) {
+                /** @var \OC\Files\Storage\Home $storage */
+                $user = $storage->getUser();
+            } else {
+                $user = \OC::$server->getUserSession()->getUser();
+            }
+            $quota = OC_Util::getUserQuota($user);
+            if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+                // always get free space / total space from root + mount points
+                return self::getGlobalStorageInfo($quota, $user, $mount);
+            }
+        }
+
+        // TODO: need a better way to get total space from storage
+        if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota')) {
+            /** @var \OC\Files\Storage\Wrapper\Quota $storage */
+            $quota = $sourceStorage->getQuota();
+        }
+        try {
+            $free = $sourceStorage->free_space($rootInfo->getInternalPath());
+        } catch (\Exception $e) {
+            if ($path === "") {
+                throw $e;
+            }
+            /** @var LoggerInterface $logger */
+            $logger = \OC::$server->get(LoggerInterface::class);
+            $logger->warning("Error while getting quota info, using root quota", ['exception' => $e]);
+            $rootInfo = self::getStorageInfo("");
+            $memcache->set($cacheKey, $rootInfo, 5 * 60);
+            return $rootInfo;
+        }
+        if ($free >= 0) {
+            $total = $free + $used;
+        } else {
+            $total = $free; //either unknown or unlimited
+        }
+        if ($total > 0) {
+            if ($quota > 0 && $total > $quota) {
+                $total = $quota;
+            }
+            // prevent division by zero or error codes (negative values)
+            $relative = round(($used / $total) * 10000) / 100;
+        } else {
+            $relative = 0;
+        }
+
+        $ownerId = $storage->getOwner($path);
+        $ownerDisplayName = '';
+        if ($ownerId) {
+            $ownerDisplayName = \OC::$server->getUserManager()->getDisplayName($ownerId) ?? '';
+        }
+
+        if (substr_count($mount->getMountPoint(), '/') < 3) {
+            $mountPoint = '';
+        } else {
+            [,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
+        }
+
+        $info = [
+            'free' => $free,
+            'used' => $used,
+            'quota' => $quota,
+            'total' => $total,
+            'relative' => $relative,
+            'owner' => $ownerId,
+            'ownerDisplayName' => $ownerDisplayName,
+            'mountType' => $mount->getMountType(),
+            'mountPoint' => trim($mountPoint, '/'),
+        ];
+
+        $memcache->set($cacheKey, $info, 5 * 60);
+
+        return $info;
+    }
+
+    /**
+     * Get storage info including all mount points and quota
+     */
+    private static function getGlobalStorageInfo(int $quota, IUser $user, IMountPoint $mount): array {
+        $rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
+        $used = $rootInfo['size'];
+        if ($used < 0) {
+            $used = 0;
+        }
+
+        $total = $quota;
+        $free = $quota - $used;
+
+        if ($total > 0) {
+            if ($quota > 0 && $total > $quota) {
+                $total = $quota;
+            }
+            // prevent division by zero or error codes (negative values)
+            $relative = round(($used / $total) * 10000) / 100;
+        } else {
+            $relative = 0;
+        }
+
+        if (substr_count($mount->getMountPoint(), '/') < 3) {
+            $mountPoint = '';
+        } else {
+            [,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
+        }
+
+        return [
+            'free' => $free,
+            'used' => $used,
+            'total' => $total,
+            'relative' => $relative,
+            'quota' => $quota,
+            'owner' => $user->getUID(),
+            'ownerDisplayName' => $user->getDisplayName(),
+            'mountType' => $mount->getMountType(),
+            'mountPoint' => trim($mountPoint, '/'),
+        ];
+    }
+
+    /**
+     * Returns whether the config file is set manually to read-only
+     * @return bool
+     */
+    public static function isReadOnlyConfigEnabled() {
+        return \OC::$server->getConfig()->getSystemValue('config_is_read_only', false);
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -104,7 +104,7 @@ 
 	public static function computerFileSize($str) {
 		$str = strtolower($str);
 		if (is_numeric($str)) {
-			return (int)$str;
+			return (int) $str;
 		}
 
 		$bytes_array = [
@@ -121,7 +121,7 @@ 
 			'p' => 1024 * 1024 * 1024 * 1024 * 1024,
 		];
 
-		$bytes = (float)$str;
+		$bytes = (float) $str;
 
 		if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
 			$bytes *= $bytes_array[$matches[1]];
@@ -131,7 +131,7 @@ 
 
 		$bytes = round($bytes);
 
-		return (int)$bytes;
+		return (int) $bytes;
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 		}
 		foreach ($dirs as $dir) {
 			foreach ($exts as $ext) {
-				if ($check_fn("$dir/$name" . $ext)) {
+				if ($check_fn("$dir/$name".$ext)) {
 					return true;
 				}
 			}
@@ -308,7 +308,7 @@ 
 			$ext = '';
 		}
 
-		$newpath = $path . '/' . $filename;
+		$newpath = $path.'/'.$filename;
 		if ($view->file_exists($newpath)) {
 			if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
 				//Replace the last "(number)" with "(number+1)"
@@ -324,11 +324,11 @@ 
 			do {
 				if ($offset) {
 					//Replace the last "(number)" with "(number+1)"
-					$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
+					$newname = substr_replace($name, '('.$counter.')', $offset, $match_length);
 				} else {
-					$newname = $name . ' (' . $counter . ')';
+					$newname = $name.' ('.$counter.')';
 				}
-				$newpath = $path . '/' . $newname . $ext;
+				$newpath = $path.'/'.$newname.$ext;
 				$counter++;
 			} while ($view->file_exists($newpath));
 		}
@@ -409,7 +409,7 @@ 
 			$freeSpace = max($freeSpace, 0);
 			return $freeSpace;
 		} else {
-			return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+			return (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
 		}
 	}
 
@@ -420,8 +420,8 @@ 
 	 */
 	public static function uploadLimit() {
 		$ini = \OC::$server->get(IniGetWrapper::class);
-		$upload_max_filesize = (int)OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
-		$post_max_size = (int)OCP\Util::computerFileSize($ini->get('post_max_size'));
+		$upload_max_filesize = (int) OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
+		$post_max_size = (int) OCP\Util::computerFileSize($ini->get('post_max_size'));
 		if ($upload_max_filesize === 0 && $post_max_size === 0) {
 			return INF;
 		} elseif ($upload_max_filesize === 0 || $post_max_size === 0) {
@@ -476,7 +476,7 @@ 
 		}
 		$fullPath = $view->getAbsolutePath($path);
 
-		$cacheKey = $fullPath. '::' . ($includeMountPoints ? 'include' : 'exclude');
+		$cacheKey = $fullPath.'::'.($includeMountPoints ? 'include' : 'exclude');
 		if ($useCache) {
 			$cached = $memcache->get($cacheKey);
 			if ($cached) {