nextcloud / server

apps/files/lib/Controller/ApiController.php

Unused Use Statements -1 removed lines

@@ -45,7 +45,6 @@
 use OCP\Share\IManager;
 use OC\Files\Node\Node;
 use OCP\IUserSession;
-use Sabre\VObject\Property\Boolean;
 
 /**
  * Class ApiController

Spacing +8 added lines, -8 removed lines

@@ -169,13 +169,13 @@ 
 	 * @return array
 	 */
 	private function formatNodes(array $nodes) {
-		return array_values(array_map(function (Node $node) {
+		return array_values(array_map(function(Node $node) {
 			/** @var \OC\Files\Node\Node $shareTypes */
 			$shareTypes = $this->getShareTypes($node);
 			$file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo());
 			$parts = explode('/', dirname($node->getPath()), 4);
 			if (isset($parts[3])) {
-				$file['path'] = '/' . $parts[3];
+				$file['path'] = '/'.$parts[3];
 			} else {
 				$file['path'] = '/';
 			}
@@ -285,7 +285,7 @@ 
 	 * @param bool $show
 	 */
 	public function showHiddenFiles($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int)$show);
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int) $show);
 		return new Response();
 	}
 
@@ -299,7 +299,7 @@ 
 	 * @return Response
 	 */
 	public function showQuickAccess($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', (int)$show);
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', (int) $show);
 		return new Response();
 	}
 
@@ -324,7 +324,7 @@ 
 	 * @return Response
 	 */
 	public function setSortingStrategy($strategy) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', (String)$strategy);
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', (String) $strategy);
 		return new Response();
 	}
 
@@ -348,7 +348,7 @@ 
 	 * @return Response
 	 */
 	public function setReverseQuickaccess($reverse) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_reverse_list', (int)$reverse);
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_reverse_list', (int) $reverse);
 		return new Response();
 	}
 
@@ -375,7 +375,7 @@ 
 	 * @return Response
 	 */
 	public function setShowQuickaccessSettings($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_show_settings', (int)$show);
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_show_settings', (int) $show);
 		return new Response();
 	}
 
@@ -402,7 +402,7 @@ 
 	 * @return Response
 	 */
 	public function setSortingOrder($order) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_custom_sorting_order', (String)$order);
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_custom_sorting_order', (String) $order);
 		return new Response();
 	}
 

Indentation +377 added lines, -377 removed lines

@@ -53,383 +53,383 @@
  * @package OCA\Files\Controller
  */
 class ApiController extends Controller {
-	/** @var TagService */
-	private $tagService;
-	/** @var IManager * */
-	private $shareManager;
-	/** @var IPreview */
-	private $previewManager;
-	/** IUserSession */
-	private $userSession;
-	/** IConfig */
-	private $config;
-	/** @var Folder */
-	private $userFolder;
-
-	/**
-	 * @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) {
-		parent::__construct($appName, $request);
-		$this->userSession = $userSession;
-		$this->tagService = $tagService;
-		$this->previewManager = $previewManager;
-		$this->shareManager = $shareManager;
-		$this->config = $config;
-		$this->userFolder = $userFolder;
-	}
-
-	/**
-	 * Gets a thumbnail of the specified file
-	 *
-	 * @since API version 1.0
-	 *
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @StrictCookieRequired
-	 *
-	 * @param int $x
-	 * @param int $y
-	 * @param string $file URL-encoded filename
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getThumbnail($x, $y, $file) {
-		if ($x < 1 || $y < 1) {
-			return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$file = $this->userFolder->get($file);
-			if ($file instanceof Folder) {
-				throw new NotFoundException();
-			}
-
-			/** @var File $file */
-			$preview = $this->previewManager->getPreview($file, $x, $y, true);
-
-			return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse(['message' => 'File not found.'], Http::STATUS_NOT_FOUND);
-		} catch (\Exception $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
-
-	/**
-	 * Updates the info of the specified file path
-	 * The passed tags are absolute, which means they will
-	 * replace the actual tag selection.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $path path
-	 * @param array|string $tags array of tags
-	 * @return DataResponse
-	 */
-	public function updateFileTags($path, $tags = null) {
-		$result = [];
-		// if tags specified or empty array, update tags
-		if (!is_null($tags)) {
-			try {
-				$this->tagService->updateFileTags($path, $tags);
-			} catch (\OCP\Files\NotFoundException $e) {
-				return new DataResponse([
-					'message' => $e->getMessage()
-				], Http::STATUS_NOT_FOUND);
-			} catch (\OCP\Files\StorageNotAvailableException $e) {
-				return new DataResponse([
-					'message' => $e->getMessage()
-				], Http::STATUS_SERVICE_UNAVAILABLE);
-			} catch (\Exception $e) {
-				return new DataResponse([
-					'message' => $e->getMessage()
-				], Http::STATUS_NOT_FOUND);
-			}
-			$result['tags'] = $tags;
-		}
-		return new DataResponse($result);
-	}
-
-	/**
-	 * @param \OCP\Files\Node[] $nodes
-	 * @return array
-	 */
-	private function formatNodes(array $nodes) {
-		return array_values(array_map(function (Node $node) {
-			/** @var \OC\Files\Node\Node $shareTypes */
-			$shareTypes = $this->getShareTypes($node);
-			$file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo());
-			$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));
-	}
-
-	/**
-	 * Returns a list of recently modifed 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 favorites modifed folder.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return DataResponse
-	 */
-	public function getFavoritesFolder() {
-		$nodes = $this->userFolder->searchByTag('_$!<Favorite>!$_', $this->userSession->getUser()->getUID());
-
-		$favorites = [];
-		$i = 0;
-		foreach ($nodes as &$node) {
-
-			$favorites[$i]['id'] = $node->getId();
-			$favorites[$i]['name'] = $node->getName();
-			$favorites[$i]['path'] = $node->getInternalPath();
-			$favorites[$i]['mtime'] = $node->getMTime();
-			$i++;
-		}
-
-		return new DataResponse(['favoriteFolders' => $favorites]);
-	}
-
-	/**
-	 * Return a list of share types for outgoing shares
-	 *
-	 * @param Node $node file node
-	 *
-	 * @return int[] array of share types
-	 */
-	private function getShareTypes(Node $node) {
-		$userId = $this->userSession->getUser()->getUID();
-		$shareTypes = [];
-		$requestedShareTypes = [
-			\OCP\Share::SHARE_TYPE_USER,
-			\OCP\Share::SHARE_TYPE_GROUP,
-			\OCP\Share::SHARE_TYPE_LINK,
-			\OCP\Share::SHARE_TYPE_REMOTE,
-			\OCP\Share::SHARE_TYPE_EMAIL
-		];
-		foreach ($requestedShareTypes as $requestedShareType) {
-			// one of each type is enough to find out about the types
-			$shares = $this->shareManager->getSharesBy(
-				$userId,
-				$requestedShareType,
-				$node,
-				false,
-				1
-			);
-			if (!empty($shares)) {
-				$shareTypes[] = $requestedShareType;
-			}
-		}
-		return $shareTypes;
-	}
-
-	/**
-	 * Change the default sort mode
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $mode
-	 * @param string $direction
-	 * @return Response
-	 */
-	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 for showing/hiding hidden files
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param bool $show
-	 */
-	public function showHiddenFiles($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int)$show);
-		return new Response();
-	}
-
-	/**
-	 * Toggle default for showing/hiding QuickAccess folder
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param bool $show
-	 *
-	 * @return Response
-	 */
-	public function showQuickAccess($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', (int)$show);
-		return new Response();
-	}
-
-	/**
-	 * Toggle default for showing/hiding QuickAccess folder
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return String
-	 */
-	public function getShowQuickAccess() {
-
-		return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', 0);
-	}
-
-	/**
-	 * quickaccess-sorting-strategy
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $strategy
-	 * @return Response
-	 */
-	public function setSortingStrategy($strategy) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', (String)$strategy);
-		return new Response();
-	}
-
-	/**
-	 * Get reverse-state for quickaccess-list
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return String
-	 */
-	public function getSortingStrategy() {
-		return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', 'alphabet');
-	}
-
-	/**
-	 * Toggle for reverse quickaccess-list
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param bool $reverse
-	 * @return Response
-	 */
-	public function setReverseQuickaccess($reverse) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_reverse_list', (int)$reverse);
-		return new Response();
-	}
-
-	/**
-	 * Get reverse-state for quickaccess-list
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return bool
-	 */
-	public function getReverseQuickaccess() {
-		if ($this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_reverse_list', false)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Set state for show sorting menu
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param bool $show
-	 * @return Response
-	 */
-	public function setShowQuickaccessSettings($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_show_settings', (int)$show);
-		return new Response();
-	}
-
-	/**
-	 * Get state for show sorting menu
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return bool
-	 */
-	public function getShowQuickaccessSettings() {
-		if ($this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_show_settings', false)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Set sorting-order for custom sorting
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param String $order
-	 * @return Response
-	 */
-	public function setSortingOrder($order) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_custom_sorting_order', (String)$order);
-		return new Response();
-	}
-
-	/**
-	 * Get sorting-order for custom sorting
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return String
-	 */
-	public function getSortingOrder() {
-		return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_custom_sorting_order', "");
-	}
-
-	/**
-	 * Get sorting-order for custom sorting
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param String
-	 * @return String
-	 */
-	public function getNodeType($folderpath) {
-		$node = $this->userFolder->get($folderpath);
-		return $node->getType();
-	}
+    /** @var TagService */
+    private $tagService;
+    /** @var IManager * */
+    private $shareManager;
+    /** @var IPreview */
+    private $previewManager;
+    /** IUserSession */
+    private $userSession;
+    /** IConfig */
+    private $config;
+    /** @var Folder */
+    private $userFolder;
+
+    /**
+     * @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) {
+        parent::__construct($appName, $request);
+        $this->userSession = $userSession;
+        $this->tagService = $tagService;
+        $this->previewManager = $previewManager;
+        $this->shareManager = $shareManager;
+        $this->config = $config;
+        $this->userFolder = $userFolder;
+    }
+
+    /**
+     * Gets a thumbnail of the specified file
+     *
+     * @since API version 1.0
+     *
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @StrictCookieRequired
+     *
+     * @param int $x
+     * @param int $y
+     * @param string $file URL-encoded filename
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getThumbnail($x, $y, $file) {
+        if ($x < 1 || $y < 1) {
+            return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $file = $this->userFolder->get($file);
+            if ($file instanceof Folder) {
+                throw new NotFoundException();
+            }
+
+            /** @var File $file */
+            $preview = $this->previewManager->getPreview($file, $x, $y, true);
+
+            return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse(['message' => 'File not found.'], Http::STATUS_NOT_FOUND);
+        } catch (\Exception $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
+
+    /**
+     * Updates the info of the specified file path
+     * The passed tags are absolute, which means they will
+     * replace the actual tag selection.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $path path
+     * @param array|string $tags array of tags
+     * @return DataResponse
+     */
+    public function updateFileTags($path, $tags = null) {
+        $result = [];
+        // if tags specified or empty array, update tags
+        if (!is_null($tags)) {
+            try {
+                $this->tagService->updateFileTags($path, $tags);
+            } catch (\OCP\Files\NotFoundException $e) {
+                return new DataResponse([
+                    'message' => $e->getMessage()
+                ], Http::STATUS_NOT_FOUND);
+            } catch (\OCP\Files\StorageNotAvailableException $e) {
+                return new DataResponse([
+                    'message' => $e->getMessage()
+                ], Http::STATUS_SERVICE_UNAVAILABLE);
+            } catch (\Exception $e) {
+                return new DataResponse([
+                    'message' => $e->getMessage()
+                ], Http::STATUS_NOT_FOUND);
+            }
+            $result['tags'] = $tags;
+        }
+        return new DataResponse($result);
+    }
+
+    /**
+     * @param \OCP\Files\Node[] $nodes
+     * @return array
+     */
+    private function formatNodes(array $nodes) {
+        return array_values(array_map(function (Node $node) {
+            /** @var \OC\Files\Node\Node $shareTypes */
+            $shareTypes = $this->getShareTypes($node);
+            $file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo());
+            $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));
+    }
+
+    /**
+     * Returns a list of recently modifed 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 favorites modifed folder.
+     *
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     */
+    public function getFavoritesFolder() {
+        $nodes = $this->userFolder->searchByTag('_$!<Favorite>!$_', $this->userSession->getUser()->getUID());
+
+        $favorites = [];
+        $i = 0;
+        foreach ($nodes as &$node) {
+
+            $favorites[$i]['id'] = $node->getId();
+            $favorites[$i]['name'] = $node->getName();
+            $favorites[$i]['path'] = $node->getInternalPath();
+            $favorites[$i]['mtime'] = $node->getMTime();
+            $i++;
+        }
+
+        return new DataResponse(['favoriteFolders' => $favorites]);
+    }
+
+    /**
+     * Return a list of share types for outgoing shares
+     *
+     * @param Node $node file node
+     *
+     * @return int[] array of share types
+     */
+    private function getShareTypes(Node $node) {
+        $userId = $this->userSession->getUser()->getUID();
+        $shareTypes = [];
+        $requestedShareTypes = [
+            \OCP\Share::SHARE_TYPE_USER,
+            \OCP\Share::SHARE_TYPE_GROUP,
+            \OCP\Share::SHARE_TYPE_LINK,
+            \OCP\Share::SHARE_TYPE_REMOTE,
+            \OCP\Share::SHARE_TYPE_EMAIL
+        ];
+        foreach ($requestedShareTypes as $requestedShareType) {
+            // one of each type is enough to find out about the types
+            $shares = $this->shareManager->getSharesBy(
+                $userId,
+                $requestedShareType,
+                $node,
+                false,
+                1
+            );
+            if (!empty($shares)) {
+                $shareTypes[] = $requestedShareType;
+            }
+        }
+        return $shareTypes;
+    }
+
+    /**
+     * Change the default sort mode
+     *
+     * @NoAdminRequired
+     *
+     * @param string $mode
+     * @param string $direction
+     * @return Response
+     */
+    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 for showing/hiding hidden files
+     *
+     * @NoAdminRequired
+     *
+     * @param bool $show
+     */
+    public function showHiddenFiles($show) {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int)$show);
+        return new Response();
+    }
+
+    /**
+     * Toggle default for showing/hiding QuickAccess folder
+     *
+     * @NoAdminRequired
+     *
+     * @param bool $show
+     *
+     * @return Response
+     */
+    public function showQuickAccess($show) {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', (int)$show);
+        return new Response();
+    }
+
+    /**
+     * Toggle default for showing/hiding QuickAccess folder
+     *
+     * @NoAdminRequired
+     *
+     * @return String
+     */
+    public function getShowQuickAccess() {
+
+        return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', 0);
+    }
+
+    /**
+     * quickaccess-sorting-strategy
+     *
+     * @NoAdminRequired
+     *
+     * @param string $strategy
+     * @return Response
+     */
+    public function setSortingStrategy($strategy) {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', (String)$strategy);
+        return new Response();
+    }
+
+    /**
+     * Get reverse-state for quickaccess-list
+     *
+     * @NoAdminRequired
+     *
+     * @return String
+     */
+    public function getSortingStrategy() {
+        return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', 'alphabet');
+    }
+
+    /**
+     * Toggle for reverse quickaccess-list
+     *
+     * @NoAdminRequired
+     *
+     * @param bool $reverse
+     * @return Response
+     */
+    public function setReverseQuickaccess($reverse) {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_reverse_list', (int)$reverse);
+        return new Response();
+    }
+
+    /**
+     * Get reverse-state for quickaccess-list
+     *
+     * @NoAdminRequired
+     *
+     * @return bool
+     */
+    public function getReverseQuickaccess() {
+        if ($this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_reverse_list', false)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Set state for show sorting menu
+     *
+     * @NoAdminRequired
+     *
+     * @param bool $show
+     * @return Response
+     */
+    public function setShowQuickaccessSettings($show) {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_show_settings', (int)$show);
+        return new Response();
+    }
+
+    /**
+     * Get state for show sorting menu
+     *
+     * @NoAdminRequired
+     *
+     * @return bool
+     */
+    public function getShowQuickaccessSettings() {
+        if ($this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_show_settings', false)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Set sorting-order for custom sorting
+     *
+     * @NoAdminRequired
+     *
+     * @param String $order
+     * @return Response
+     */
+    public function setSortingOrder($order) {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_custom_sorting_order', (String)$order);
+        return new Response();
+    }
+
+    /**
+     * Get sorting-order for custom sorting
+     *
+     * @NoAdminRequired
+     *
+     * @return String
+     */
+    public function getSortingOrder() {
+        return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_custom_sorting_order', "");
+    }
+
+    /**
+     * Get sorting-order for custom sorting
+     *
+     * @NoAdminRequired
+     *
+     * @param String
+     * @return String
+     */
+    public function getNodeType($folderpath) {
+        $node = $this->userFolder->get($folderpath);
+        return $node->getType();
+    }
 
 
 }

apps/files/lib/Controller/ViewController.php

Spacing +5 added lines, -5 removed lines

@@ -110,7 +110,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();
@@ -230,7 +230,7 @@ 
 		);
 
 		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
-		usort($navItems, function ($item1, $item2) {
+		usort($navItems, function($item1, $item2) {
 			return $item1['order'] - $item2['order'];
 		});
 
@@ -264,14 +264,14 @@ 
 		$this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts', $event);
 
 		$params = [];
-		$params['usedSpacePercent'] = (int)$storageInfo['relative'];
+		$params['usedSpacePercent'] = (int) $storageInfo['relative'];
 		$params['owner'] = $storageInfo['owner'];
 		$params['ownerDisplayName'] = $storageInfo['ownerDisplayName'];
 		$params['isPublic'] = false;
 		$params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
 		$params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
 		$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
-		$showHidden = (bool)$this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
+		$showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
 		$params['showHiddenFiles'] = $showHidden ? 1 : 0;
 		$params['fileNotFound'] = $fileNotFound ? 1 : 0;
 		$params['appNavigation'] = $nav;
@@ -305,7 +305,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';
 		}

Indentation +255 added lines, -255 removed lines

@@ -51,259 +51,259 @@
  * @package OCA\Files\Controller
  */
 class ViewController extends Controller {
-	/** @var string */
-	protected $appName;
-	/** @var IRequest */
-	protected $request;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var IConfig */
-	protected $config;
-	/** @var EventDispatcherInterface */
-	protected $eventDispatcher;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IAppManager */
-	protected $appManager;
-	/** @var IRootFolder */
-	protected $rootFolder;
-	/** @var Helper */
-	protected $activityHelper;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								IURLGenerator $urlGenerator,
-								IL10N $l10n,
-								IConfig $config,
-								EventDispatcherInterface $eventDispatcherInterface,
-								IUserSession $userSession,
-								IAppManager $appManager,
-								IRootFolder $rootFolder,
-								Helper $activityHelper
-	) {
-		parent::__construct($appName, $request);
-		$this->appName = $appName;
-		$this->request = $request;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->eventDispatcher = $eventDispatcherInterface;
-		$this->userSession = $userSession;
-		$this->appManager = $appManager;
-		$this->rootFolder = $rootFolder;
-		$this->activityHelper = $activityHelper;
-	}
-
-	/**
-	 * @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() {
-		$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
-		return \OC_Helper::getStorageInfo('/', $dirInfo);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $dir
-	 * @param string $view
-	 * @param string $fileid
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
-		if ($fileid !== null) {
-			try {
-				return $this->showFile($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');
-
-		// mostly for the home storage's free space
-		// FIXME: Make non static
-		$storageInfo = $this->getStorageInfo();
-
-		$user = $this->userSession->getUser()->getUID();
-
-		try {
-			$favElements = $this->activityHelper->getFavoriteFilePaths($this->userSession->getUser()->getUID());
-		} catch (\RuntimeException $e) {
-			$favElements['folders'] = null;
-		}
-
-		$collapseClasses = '';
-		if (count($favElements['folders']) > 0) {
-			$collapseClasses = 'collapsible';
-		}
-
-		$favoritesSublistArray = Array();
-
-		$navBarPositionPosition = 6;
-		$currentCount = 0;
-		foreach ($favElements['folders'] as $dir) {
-
-			$id = substr($dir, strrpos($dir, '/') + 1, strlen($dir));
-			$link = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']);
-			$sortingValue = ++$currentCount;
-			$element = [
-				'id' => str_replace('/', '-', $dir),
-				'view' => 'files',
-				'href' => $link,
-				'dir' => $dir,
-				'order' => $navBarPositionPosition,
-				'folderPosition' => $sortingValue,
-				'name' => $id,
-				'icon' => 'files',
-				'quickaccesselement' => 'true'
-			];
-
-			array_push($favoritesSublistArray, $element);
-			$navBarPositionPosition++;
-		}
-
-
-		// show_Quick_Access stored as string
-		$defaultExpandedState = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', '0') === '1';
-
-		\OCA\Files\App::getNavigationManager()->add(
-			[
-				'id' => 'favorites',
-				'appname' => 'files',
-				'script' => 'simplelist.php',
-				'classes' => $collapseClasses,
-				'order' => 5,
-				'name' => $this->l10n->t('Favorites'),
-				'sublist' => $favoritesSublistArray,
-				'defaultExpandedState' => $defaultExpandedState,
-				'enableMenuButton' => 0,
-			]
-		);
-
-		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
-		usort($navItems, function ($item1, $item2) {
-			return $item1['order'] - $item2['order'];
-		});
-
-		$nav->assign('navigationItems', $navItems);
-
-		$nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
-		if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			$totalSpace = $this->l10n->t('Unlimited');
-		} else {
-			$totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
-		}
-		$nav->assign('total_space', $totalSpace);
-		$nav->assign('quota', $storageInfo['quota']);
-		$nav->assign('usage_relative', $storageInfo['relative']);
-
-		$contentItems = [];
-
-		// render the container content for every navigation item
-		foreach ($navItems as $item) {
-			$content = '';
-			if (isset($item['script'])) {
-				$content = $this->renderScript($item['appname'], $item['script']);
-			}
-			$contentItem = [];
-			$contentItem['id'] = $item['id'];
-			$contentItem['content'] = $content;
-			$contentItems[] = $contentItem;
-		}
-
-		$event = new GenericEvent(null, ['hiddenFields' => []]);
-		$this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts', $event);
-
-		$params = [];
-		$params['usedSpacePercent'] = (int)$storageInfo['relative'];
-		$params['owner'] = $storageInfo['owner'];
-		$params['ownerDisplayName'] = $storageInfo['ownerDisplayName'];
-		$params['isPublic'] = false;
-		$params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
-		$params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
-		$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
-		$showHidden = (bool)$this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
-		$params['showHiddenFiles'] = $showHidden ? 1 : 0;
-		$params['fileNotFound'] = $fileNotFound ? 1 : 0;
-		$params['appNavigation'] = $nav;
-		$params['appContents'] = $contentItems;
-		$params['hiddenFields'] = $event->getArgument('hiddenFields');
-
-		$response = new TemplateResponse(
-			$this->appName,
-			'index',
-			$params
-		);
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedFrameDomain('\'self\'');
-		$response->setContentSecurityPolicy($policy);
-
-
-		return $response;
-	}
-
-	/**
-	 * Redirects to the file list and highlight the given file id
-	 *
-	 * @param string $fileId file id to show
-	 * @return RedirectResponse redirect response or not found response
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function showFile($fileId) {
-		$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();
-			}
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
-		}
-		throw new \OCP\Files\NotFoundException();
-	}
+    /** @var string */
+    protected $appName;
+    /** @var IRequest */
+    protected $request;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var IConfig */
+    protected $config;
+    /** @var EventDispatcherInterface */
+    protected $eventDispatcher;
+    /** @var IUserSession */
+    protected $userSession;
+    /** @var IAppManager */
+    protected $appManager;
+    /** @var IRootFolder */
+    protected $rootFolder;
+    /** @var Helper */
+    protected $activityHelper;
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IURLGenerator $urlGenerator,
+                                IL10N $l10n,
+                                IConfig $config,
+                                EventDispatcherInterface $eventDispatcherInterface,
+                                IUserSession $userSession,
+                                IAppManager $appManager,
+                                IRootFolder $rootFolder,
+                                Helper $activityHelper
+    ) {
+        parent::__construct($appName, $request);
+        $this->appName = $appName;
+        $this->request = $request;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->eventDispatcher = $eventDispatcherInterface;
+        $this->userSession = $userSession;
+        $this->appManager = $appManager;
+        $this->rootFolder = $rootFolder;
+        $this->activityHelper = $activityHelper;
+    }
+
+    /**
+     * @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() {
+        $dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
+        return \OC_Helper::getStorageInfo('/', $dirInfo);
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     *
+     * @param string $dir
+     * @param string $view
+     * @param string $fileid
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
+        if ($fileid !== null) {
+            try {
+                return $this->showFile($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');
+
+        // mostly for the home storage's free space
+        // FIXME: Make non static
+        $storageInfo = $this->getStorageInfo();
+
+        $user = $this->userSession->getUser()->getUID();
+
+        try {
+            $favElements = $this->activityHelper->getFavoriteFilePaths($this->userSession->getUser()->getUID());
+        } catch (\RuntimeException $e) {
+            $favElements['folders'] = null;
+        }
+
+        $collapseClasses = '';
+        if (count($favElements['folders']) > 0) {
+            $collapseClasses = 'collapsible';
+        }
+
+        $favoritesSublistArray = Array();
+
+        $navBarPositionPosition = 6;
+        $currentCount = 0;
+        foreach ($favElements['folders'] as $dir) {
+
+            $id = substr($dir, strrpos($dir, '/') + 1, strlen($dir));
+            $link = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']);
+            $sortingValue = ++$currentCount;
+            $element = [
+                'id' => str_replace('/', '-', $dir),
+                'view' => 'files',
+                'href' => $link,
+                'dir' => $dir,
+                'order' => $navBarPositionPosition,
+                'folderPosition' => $sortingValue,
+                'name' => $id,
+                'icon' => 'files',
+                'quickaccesselement' => 'true'
+            ];
+
+            array_push($favoritesSublistArray, $element);
+            $navBarPositionPosition++;
+        }
+
+
+        // show_Quick_Access stored as string
+        $defaultExpandedState = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_Quick_Access', '0') === '1';
+
+        \OCA\Files\App::getNavigationManager()->add(
+            [
+                'id' => 'favorites',
+                'appname' => 'files',
+                'script' => 'simplelist.php',
+                'classes' => $collapseClasses,
+                'order' => 5,
+                'name' => $this->l10n->t('Favorites'),
+                'sublist' => $favoritesSublistArray,
+                'defaultExpandedState' => $defaultExpandedState,
+                'enableMenuButton' => 0,
+            ]
+        );
+
+        $navItems = \OCA\Files\App::getNavigationManager()->getAll();
+        usort($navItems, function ($item1, $item2) {
+            return $item1['order'] - $item2['order'];
+        });
+
+        $nav->assign('navigationItems', $navItems);
+
+        $nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
+        if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+            $totalSpace = $this->l10n->t('Unlimited');
+        } else {
+            $totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
+        }
+        $nav->assign('total_space', $totalSpace);
+        $nav->assign('quota', $storageInfo['quota']);
+        $nav->assign('usage_relative', $storageInfo['relative']);
+
+        $contentItems = [];
+
+        // render the container content for every navigation item
+        foreach ($navItems as $item) {
+            $content = '';
+            if (isset($item['script'])) {
+                $content = $this->renderScript($item['appname'], $item['script']);
+            }
+            $contentItem = [];
+            $contentItem['id'] = $item['id'];
+            $contentItem['content'] = $content;
+            $contentItems[] = $contentItem;
+        }
+
+        $event = new GenericEvent(null, ['hiddenFields' => []]);
+        $this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts', $event);
+
+        $params = [];
+        $params['usedSpacePercent'] = (int)$storageInfo['relative'];
+        $params['owner'] = $storageInfo['owner'];
+        $params['ownerDisplayName'] = $storageInfo['ownerDisplayName'];
+        $params['isPublic'] = false;
+        $params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
+        $params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
+        $params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
+        $showHidden = (bool)$this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
+        $params['showHiddenFiles'] = $showHidden ? 1 : 0;
+        $params['fileNotFound'] = $fileNotFound ? 1 : 0;
+        $params['appNavigation'] = $nav;
+        $params['appContents'] = $contentItems;
+        $params['hiddenFields'] = $event->getArgument('hiddenFields');
+
+        $response = new TemplateResponse(
+            $this->appName,
+            'index',
+            $params
+        );
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedFrameDomain('\'self\'');
+        $response->setContentSecurityPolicy($policy);
+
+
+        return $response;
+    }
+
+    /**
+     * Redirects to the file list and highlight the given file id
+     *
+     * @param string $fileId file id to show
+     * @return RedirectResponse redirect response or not found response
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function showFile($fileId) {
+        $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();
+            }
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
+        }
+        throw new \OCP\Files\NotFoundException();
+    }
 }

apps/files/lib/AppInfo/Application.php

Indentation +58 added lines, -58 removed lines

@@ -35,69 +35,69 @@
 use OCA\Files\Capabilities;
 
 class Application extends App {
-	public function __construct(array $urlParams=array()) {
-		parent::__construct('files', $urlParams);
-		$container = $this->getContainer();
-		$server = $container->getServer();
+    public function __construct(array $urlParams=array()) {
+        parent::__construct('files', $urlParams);
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		/**
-		 * Controllers
-		 */
-		$container->registerService('APIController', function (IContainer $c) use ($server) {
-			return new ApiController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$server->getUserSession(),
-				$c->query('TagService'),
-				$server->getPreviewManager(),
-				$server->getShareManager(),
-				$server->getConfig(),
-				$server->getUserFolder()
-			);
-		});
+        /**
+         * Controllers
+         */
+        $container->registerService('APIController', function (IContainer $c) use ($server) {
+            return new ApiController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $server->getUserSession(),
+                $c->query('TagService'),
+                $server->getPreviewManager(),
+                $server->getShareManager(),
+                $server->getConfig(),
+                $server->getUserFolder()
+            );
+        });
 
-		$container->registerService('ViewController', function (IContainer $c) use ($server) {
-			return new ViewController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$server->getURLGenerator(),
-				$c->query('L10N'),
-				$server->getConfig(),
-				$server->getEventDispatcher(),
-				$server->getUserSession(),
-				$server->getAppManager(),
-				$server->getRootFolder(),
-				$c->query(Helper::class)
-			);
-		});
+        $container->registerService('ViewController', function (IContainer $c) use ($server) {
+            return new ViewController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $server->getURLGenerator(),
+                $c->query('L10N'),
+                $server->getConfig(),
+                $server->getEventDispatcher(),
+                $server->getUserSession(),
+                $server->getAppManager(),
+                $server->getRootFolder(),
+                $c->query(Helper::class)
+            );
+        });
 
-		/**
-		 * Core
-		 */
-		$container->registerService('L10N', function(IContainer $c) {
-			return $c->query('ServerContainer')->getL10N($c->query('AppName'));
-		});
+        /**
+         * Core
+         */
+        $container->registerService('L10N', function(IContainer $c) {
+            return $c->query('ServerContainer')->getL10N($c->query('AppName'));
+        });
 
-		/**
-		 * Services
-		 */
-		$container->registerService('Tagger', function(IContainer $c)  {
-			return $c->query('ServerContainer')->getTagManager()->load('files');
-		});
-		$container->registerService('TagService', function(IContainer $c) use ($server) {
-			$homeFolder = $c->query('ServerContainer')->getUserFolder();
-			return new TagService(
-				$c->query('ServerContainer')->getUserSession(),
-				$c->query('ServerContainer')->getActivityManager(),
-				$c->query('Tagger'),
-				$homeFolder,
-				$server->getEventDispatcher()
-			);
-		});
+        /**
+         * Services
+         */
+        $container->registerService('Tagger', function(IContainer $c)  {
+            return $c->query('ServerContainer')->getTagManager()->load('files');
+        });
+        $container->registerService('TagService', function(IContainer $c) use ($server) {
+            $homeFolder = $c->query('ServerContainer')->getUserFolder();
+            return new TagService(
+                $c->query('ServerContainer')->getUserSession(),
+                $c->query('ServerContainer')->getActivityManager(),
+                $c->query('Tagger'),
+                $homeFolder,
+                $server->getEventDispatcher()
+            );
+        });
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability(Capabilities::class);
-	}
+        $container->registerCapability(Capabilities::class);
+    }
 }

apps/files/templates/appnavigation.php

Indentation +25 added lines, -25 removed lines

@@ -3,24 +3,24 @@ 
 
 		<?php
 
-		$pinned = 0;
-		foreach ($_['navigationItems'] as $item) {
-			$pinned = NavigationListElements($item, $l, $pinned);
-		}
-		?>
+        $pinned = 0;
+        foreach ($_['navigationItems'] as $item) {
+            $pinned = NavigationListElements($item, $l, $pinned);
+        }
+        ?>
 
 		<li id="quota"
 			class="pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?><?php
-			if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
-		} ?>">
+            if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+            ?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
+        } ?>">
 			<a href="#" class="icon-quota svg">
 				<p id="quotatext"><?php
-					if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-						p($l->t('%s of %s used', [$_['usage'], $_['total_space']]));
-					} else {
-						p($l->t('%s used', [$_['usage']]));
-					} ?></p>
+                    if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+                        p($l->t('%s of %s used', [$_['usage'], $_['total_space']]));
+                    } else {
+                        p($l->t('%s used', [$_['usage']]));
+                    } ?></p>
 				<div class="quota-container">
 					<progress value="<?php p($_['usage_relative']); ?>"
 							  max="100"
@@ -64,8 +64,8 @@ 
  * @return int Returns the pinned value
  */
 function NavigationListElements($item, $l, $pinned) {
-	strpos($item['classes'], 'pinned') !== false ? $pinned++ : '';
-	?>
+    strpos($item['classes'], 'pinned') !== false ? $pinned++ : '';
+    ?>
 	<li <?php if (isset($item['sublist'])){ ?>id="button-collapse-parent-<?php p($item['id']); ?>"<?php } ?>
 		data-id="<?php p($item['id']) ?>" data-dir="<?php p($item['dir']) ?>" data-view="<?php p($item['view']) ?>"
 		class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned === 1 ? 'first-pinned' : '') ?> <?php if ($item['defaultExpandedState']) { ?> open<?php } ?>"
@@ -76,24 +76,24 @@ 
 
 
 		<?php
-		NavigationElementMenu($item);
-		if (isset($item['sublist'])) {
-			?>
+        NavigationElementMenu($item);
+        if (isset($item['sublist'])) {
+            ?>
 			<button id="button-collapse-<?php p($item['id']); ?>"
 					class="collapse app-navigation-noclose" <?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;
 }
 
 /**
@@ -104,8 +104,8 @@ 
  * @return void
  */
 function NavigationElementMenu($item) {
-	if ($item['menubuttons'] === 'true') {
-		?>
+    if ($item['menubuttons'] === 'true') {
+        ?>
 		<div id="dotmenu-<?php p($item['id']); ?>"
 			 class="app-navigation-entry-utils" <?php if ($item['enableMenuButton'] === 0) { ?> style="display: none"<?php } ?>>
 			<ul>

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 		<li id="quota"
 			class="pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?><?php
 			if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
+			?>has-tooltip" title="<?php p($_['usage_relative'].'%');
 		} ?>">
 			<a href="#" class="icon-quota svg">
 				<p id="quotatext"><?php
@@ -66,7 +66,7 @@ 
 function NavigationListElements($item, $l, $pinned) {
 	strpos($item['classes'], 'pinned') !== false ? $pinned++ : '';
 	?>
-	<li <?php if (isset($item['sublist'])){ ?>id="button-collapse-parent-<?php p($item['id']); ?>"<?php } ?>
+	<li <?php if (isset($item['sublist'])) { ?>id="button-collapse-parent-<?php p($item['id']); ?>"<?php } ?>
 		data-id="<?php p($item['id']) ?>" data-dir="<?php p($item['dir']) ?>" data-view="<?php p($item['view']) ?>"
 		class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned === 1 ? 'first-pinned' : '') ?> <?php if ($item['defaultExpandedState']) { ?> open<?php } ?>"
 		<?php if (isset($item['folderPosition'])) { ?> folderposition="<?php p($item['folderPosition']); ?>" <?php } ?>>

apps/files/appinfo/routes.php

Indentation +109 added lines, -109 removed lines

@@ -31,118 +31,118 @@
 
 $application = new Application();
 $application->registerRoutes(
-	$this,
-	[
-		'routes' => [
-			[
-				'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#updateFileSorting',
-				'url' => '/api/v1/sorting',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'API#showHiddenFiles',
-				'url' => '/api/v1/showhidden',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'view#index',
-				'url' => '/',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'settings#setMaxUploadSize',
-				'url' => '/settings/maxUpload',
-				'verb' => 'POST',
-			],
-			[
-				'name' => 'ajax#getStorageStats',
-				'url' => '/ajax/getstoragestats.php',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#showQuickAccess',
-				'url' => '/api/v1/quickaccess/set/showList',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#getShowQuickAccess',
-				'url' => '/api/v1/quickaccess/get/showList',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#getShowQuickaccessSettings',
-				'url' => '/api/v1/quickaccess/showsettings',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#setShowQuickaccessSettings',
-				'url' => '/api/v1/quickaccess/set/showsettings',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#setSortingStrategy',
-				'url' => '/api/v1/quickaccess/set/SortingStrategy',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#setReverseQuickaccess',
-				'url' => '/api/v1/quickaccess/set/ReverseList',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#getSortingStrategy',
-				'url' => '/api/v1/quickaccess/get/SortingStrategy',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#getReverseQuickaccess',
-				'url' => '/api/v1/quickaccess/get/ReverseList',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#getFavoritesFolder',
-				'url' => '/api/v1/quickaccess/get/FavoriteFolders/',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'API#setSortingOrder',
-				'url' => '/api/v1/quickaccess/set/CustomSortingOrder',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#getSortingOrder',
-				'url' => '/api/v1/quickaccess/get/CustomSortingOrder',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'API#getNodeType',
-				'url' => '/api/v1/quickaccess/get/NodeType',
-				'verb' => 'GET',
-			],
-		]
-	]
+    $this,
+    [
+        'routes' => [
+            [
+                '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#updateFileSorting',
+                'url' => '/api/v1/sorting',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'API#showHiddenFiles',
+                'url' => '/api/v1/showhidden',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'view#index',
+                'url' => '/',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'settings#setMaxUploadSize',
+                'url' => '/settings/maxUpload',
+                'verb' => 'POST',
+            ],
+            [
+                'name' => 'ajax#getStorageStats',
+                'url' => '/ajax/getstoragestats.php',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#showQuickAccess',
+                'url' => '/api/v1/quickaccess/set/showList',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#getShowQuickAccess',
+                'url' => '/api/v1/quickaccess/get/showList',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#getShowQuickaccessSettings',
+                'url' => '/api/v1/quickaccess/showsettings',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#setShowQuickaccessSettings',
+                'url' => '/api/v1/quickaccess/set/showsettings',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#setSortingStrategy',
+                'url' => '/api/v1/quickaccess/set/SortingStrategy',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#setReverseQuickaccess',
+                'url' => '/api/v1/quickaccess/set/ReverseList',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#getSortingStrategy',
+                'url' => '/api/v1/quickaccess/get/SortingStrategy',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#getReverseQuickaccess',
+                'url' => '/api/v1/quickaccess/get/ReverseList',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#getFavoritesFolder',
+                'url' => '/api/v1/quickaccess/get/FavoriteFolders/',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'API#setSortingOrder',
+                'url' => '/api/v1/quickaccess/set/CustomSortingOrder',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#getSortingOrder',
+                'url' => '/api/v1/quickaccess/get/CustomSortingOrder',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'API#getNodeType',
+                'url' => '/api/v1/quickaccess/get/NodeType',
+                'verb' => 'GET',
+            ],
+        ]
+    ]
 );
 
 /** @var $this \OC\Route\Router */
 
 $this->create('files_ajax_download', 'ajax/download.php')
-	->actionInclude('files/ajax/download.php');
+    ->actionInclude('files/ajax/download.php');
 $this->create('files_ajax_list', 'ajax/list.php')
-	->actionInclude('files/ajax/list.php');
+    ->actionInclude('files/ajax/list.php');