nextcloud / server

apps/files/lib/Controller/SettingsController.php

Indentation +17 added lines, -17 removed lines

@@ -29,23 +29,23 @@
 use OCP\Util;
 
 class SettingsController extends Controller {
-	public function __construct($appName, IRequest $request) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct($appName, IRequest $request) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @param string $maxUploadSize
-	 * @return JSONResponse
-	 */
-	public function setMaxUploadSize($maxUploadSize) {
-		$setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
+    /**
+     * @param string $maxUploadSize
+     * @return JSONResponse
+     */
+    public function setMaxUploadSize($maxUploadSize) {
+        $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
 
-		if ($setMaxSize === false) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		} else {
-			return new JSONResponse([
-				'maxUploadSize' => Util::humanFileSize($setMaxSize)
-			]);
-		}
-	}
+        if ($setMaxSize === false) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        } else {
+            return new JSONResponse([
+                'maxUploadSize' => Util::humanFileSize($setMaxSize)
+            ]);
+        }
+    }
 }

apps/files/lib/Controller/ApiController.php

Indentation +201 added lines, -201 removed lines

@@ -51,217 +51,217 @@
  * @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;
+    /** @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;
-	}
+    /**
+     * @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);
-		}
+    /**
+     * 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) {
-		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));
-	}
+    /**
+     * @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 recently modifed files.
+     *
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     */
+    public function getRecentFiles() {
+        $nodes = $this->userFolder->getRecent(100);
+        $files = $this->formatNodes($nodes);
+        return new DataResponse(['files' => $files]);
+    }
 
-	/**
-	 * 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;
-	}
+    /**
+     * 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();
-	}
+    /**
+     * 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 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();
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -106,7 +106,7 @@ 
 	 * @return DataResponse|FileDisplayResponse
 	 */
 	public function getThumbnail($x, $y, $file) {
-		if($x < 1 || $y < 1) {
+		if ($x < 1 || $y < 1) {
 			return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST);
 		}
 
@@ -167,13 +167,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'] = '/';
 			}

apps/files/lib/Helper.php

Braces +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 			} elseif ($file->isMounted()) {
 				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
 			}
-		}else{
+		} else{
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
 		}
 

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
 			'freeSpace' => $storageInfo['free'],
 			'quota' => $storageInfo['quota'],
 			'used' => $storageInfo['used'],
-			'usedSpacePercent'  => (int)$storageInfo['relative'],
+			'usedSpacePercent'  => (int) $storageInfo['relative'],
 			'owner' => $storageInfo['owner'],
 			'ownerDisplayName' => $storageInfo['ownerDisplayName'],
 		];
@@ -71,7 +71,7 @@ 
 	 * @return string icon URL
 	 */
 	public static function determineIcon($file) {
-		if($file['type'] === 'dir') {
+		if ($file['type'] === 'dir') {
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
 			// TODO: move this part to the client side, using mountType
 			if ($file->isShared()) {
@@ -79,11 +79,11 @@ 
 			} elseif ($file->isMounted()) {
 				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
 			}
-		}else{
+		} else {
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
 		}
 
-		return substr($icon, 0, -3) . 'svg';
+		return substr($icon, 0, -3).'svg';
 	}
 
 	/**

Indentation +208 added lines, -208 removed lines

@@ -39,232 +39,232 @@
  * Helper class for manipulating file information
  */
 class Helper {
-	/**
-	 * @param string $dir
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public static function buildFileStorageStatistics($dir) {
-		// information about storage capacities
-		$storageInfo = \OC_Helper::getStorageInfo($dir);
-		$l = \OC::$server->getL10N('files');
-		$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
-		$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
-		$maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));
+    /**
+     * @param string $dir
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    public static function buildFileStorageStatistics($dir) {
+        // information about storage capacities
+        $storageInfo = \OC_Helper::getStorageInfo($dir);
+        $l = \OC::$server->getL10N('files');
+        $maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
+        $maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
+        $maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));
 
-		return [
-			'uploadMaxFilesize' => $maxUploadFileSize,
-			'maxHumanFilesize'  => $maxHumanFileSize,
-			'freeSpace' => $storageInfo['free'],
-			'quota' => $storageInfo['quota'],
-			'used' => $storageInfo['used'],
-			'usedSpacePercent'  => (int)$storageInfo['relative'],
-			'owner' => $storageInfo['owner'],
-			'ownerDisplayName' => $storageInfo['ownerDisplayName'],
-		];
-	}
+        return [
+            'uploadMaxFilesize' => $maxUploadFileSize,
+            'maxHumanFilesize'  => $maxHumanFileSize,
+            'freeSpace' => $storageInfo['free'],
+            'quota' => $storageInfo['quota'],
+            'used' => $storageInfo['used'],
+            'usedSpacePercent'  => (int)$storageInfo['relative'],
+            'owner' => $storageInfo['owner'],
+            'ownerDisplayName' => $storageInfo['ownerDisplayName'],
+        ];
+    }
 
-	/**
-	 * Determine icon for a given file
-	 *
-	 * @param \OCP\Files\FileInfo $file file info
-	 * @return string icon URL
-	 */
-	public static function determineIcon($file) {
-		if($file['type'] === 'dir') {
-			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
-			// TODO: move this part to the client side, using mountType
-			if ($file->isShared()) {
-				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared');
-			} elseif ($file->isMounted()) {
-				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
-			}
-		}else{
-			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
-		}
+    /**
+     * Determine icon for a given file
+     *
+     * @param \OCP\Files\FileInfo $file file info
+     * @return string icon URL
+     */
+    public static function determineIcon($file) {
+        if($file['type'] === 'dir') {
+            $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
+            // TODO: move this part to the client side, using mountType
+            if ($file->isShared()) {
+                $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared');
+            } elseif ($file->isMounted()) {
+                $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
+            }
+        }else{
+            $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
+        }
 
-		return substr($icon, 0, -3) . 'svg';
-	}
+        return substr($icon, 0, -3) . 'svg';
+    }
 
-	/**
-	 * Comparator function to sort files alphabetically and have
-	 * the directories appear first
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareFileNames(FileInfo $a, FileInfo $b) {
-		$aType = $a->getType();
-		$bType = $b->getType();
-		if ($aType === 'dir' and $bType !== 'dir') {
-			return -1;
-		} elseif ($aType !== 'dir' and $bType === 'dir') {
-			return 1;
-		} else {
-			return \OCP\Util::naturalSortCompare($a->getName(), $b->getName());
-		}
-	}
+    /**
+     * Comparator function to sort files alphabetically and have
+     * the directories appear first
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareFileNames(FileInfo $a, FileInfo $b) {
+        $aType = $a->getType();
+        $bType = $b->getType();
+        if ($aType === 'dir' and $bType !== 'dir') {
+            return -1;
+        } elseif ($aType !== 'dir' and $bType === 'dir') {
+            return 1;
+        } else {
+            return \OCP\Util::naturalSortCompare($a->getName(), $b->getName());
+        }
+    }
 
-	/**
-	 * Comparator function to sort files by date
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareTimestamp(FileInfo $a, FileInfo $b) {
-		$aTime = $a->getMTime();
-		$bTime = $b->getMTime();
-		return ($aTime < $bTime) ? -1 : 1;
-	}
+    /**
+     * Comparator function to sort files by date
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareTimestamp(FileInfo $a, FileInfo $b) {
+        $aTime = $a->getMTime();
+        $bTime = $b->getMTime();
+        return ($aTime < $bTime) ? -1 : 1;
+    }
 
-	/**
-	 * Comparator function to sort files by size
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareSize(FileInfo $a, FileInfo $b) {
-		$aSize = $a->getSize();
-		$bSize = $b->getSize();
-		return ($aSize < $bSize) ? -1 : 1;
-	}
+    /**
+     * Comparator function to sort files by size
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareSize(FileInfo $a, FileInfo $b) {
+        $aSize = $a->getSize();
+        $bSize = $b->getSize();
+        return ($aSize < $bSize) ? -1 : 1;
+    }
 
-	/**
-	 * Formats the file info to be returned as JSON to the client.
-	 *
-	 * @param \OCP\Files\FileInfo $i
-	 * @return array formatted file info
-	 */
-	public static function formatFileInfo(FileInfo $i) {
-		$entry = array();
+    /**
+     * Formats the file info to be returned as JSON to the client.
+     *
+     * @param \OCP\Files\FileInfo $i
+     * @return array formatted file info
+     */
+    public static function formatFileInfo(FileInfo $i) {
+        $entry = array();
 
-		$entry['id'] = $i['fileid'];
-		$entry['parentId'] = $i['parent'];
-		$entry['mtime'] = $i['mtime'] * 1000;
-		// only pick out the needed attributes
-		$entry['name'] = $i->getName();
-		$entry['permissions'] = $i['permissions'];
-		$entry['mimetype'] = $i['mimetype'];
-		$entry['size'] = $i['size'];
-		$entry['type'] = $i['type'];
-		$entry['etag'] = $i['etag'];
-		if (isset($i['tags'])) {
-			$entry['tags'] = $i['tags'];
-		}
-		if (isset($i['displayname_owner'])) {
-			$entry['shareOwner'] = $i['displayname_owner'];
-		}
-		if (isset($i['is_share_mount_point'])) {
-			$entry['isShareMountPoint'] = $i['is_share_mount_point'];
-		}
-		$mountType = null;
-		$mount = $i->getMountPoint();
-		$mountType = $mount->getMountType();
-		if ($mountType !== '') {
-			if ($i->getInternalPath() === '') {
-				$mountType .= '-root';
-			}
-			$entry['mountType'] = $mountType;
-		}
-		if (isset($i['extraData'])) {
-			$entry['extraData'] = $i['extraData'];
-		}
-		return $entry;
-	}
+        $entry['id'] = $i['fileid'];
+        $entry['parentId'] = $i['parent'];
+        $entry['mtime'] = $i['mtime'] * 1000;
+        // only pick out the needed attributes
+        $entry['name'] = $i->getName();
+        $entry['permissions'] = $i['permissions'];
+        $entry['mimetype'] = $i['mimetype'];
+        $entry['size'] = $i['size'];
+        $entry['type'] = $i['type'];
+        $entry['etag'] = $i['etag'];
+        if (isset($i['tags'])) {
+            $entry['tags'] = $i['tags'];
+        }
+        if (isset($i['displayname_owner'])) {
+            $entry['shareOwner'] = $i['displayname_owner'];
+        }
+        if (isset($i['is_share_mount_point'])) {
+            $entry['isShareMountPoint'] = $i['is_share_mount_point'];
+        }
+        $mountType = null;
+        $mount = $i->getMountPoint();
+        $mountType = $mount->getMountType();
+        if ($mountType !== '') {
+            if ($i->getInternalPath() === '') {
+                $mountType .= '-root';
+            }
+            $entry['mountType'] = $mountType;
+        }
+        if (isset($i['extraData'])) {
+            $entry['extraData'] = $i['extraData'];
+        }
+        return $entry;
+    }
 
-	/**
-	 * Format file info for JSON
-	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
-	 * @return array
-	 */
-	public static function formatFileInfos($fileInfos) {
-		$files = array();
-		foreach ($fileInfos as $i) {
-			$files[] = self::formatFileInfo($i);
-		}
+    /**
+     * Format file info for JSON
+     * @param \OCP\Files\FileInfo[] $fileInfos file infos
+     * @return array
+     */
+    public static function formatFileInfos($fileInfos) {
+        $files = array();
+        foreach ($fileInfos as $i) {
+            $files[] = self::formatFileInfo($i);
+        }
 
-		return $files;
-	}
+        return $files;
+    }
 
-	/**
-	 * Retrieves the contents of the given directory and
-	 * returns it as a sorted array of FileInfo.
-	 *
-	 * @param string $dir path to the directory
-	 * @param string $sortAttribute attribute to sort on
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @param string $mimetypeFilter limit returned content to this mimetype or mimepart
-	 * @return \OCP\Files\FileInfo[] files
-	 */
-	public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') {
-		$content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter);
+    /**
+     * Retrieves the contents of the given directory and
+     * returns it as a sorted array of FileInfo.
+     *
+     * @param string $dir path to the directory
+     * @param string $sortAttribute attribute to sort on
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @param string $mimetypeFilter limit returned content to this mimetype or mimepart
+     * @return \OCP\Files\FileInfo[] files
+     */
+    public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') {
+        $content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter);
 
-		return self::sortFiles($content, $sortAttribute, $sortDescending);
-	}
+        return self::sortFiles($content, $sortAttribute, $sortDescending);
+    }
 
-	/**
-	 * Populate the result set with file tags
-	 *
-	 * @param array $fileList
-	 * @param string $fileIdentifier identifier attribute name for values in $fileList
-	 * @param ITagManager $tagManager
-	 * @return array file list populated with tags
-	 */
-	public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) {
-		$ids = [];
-		foreach ($fileList as $fileData) {
-			$ids[] = $fileData[$fileIdentifier];
-		}
-		$tagger = $tagManager->load('files');
-		$tags = $tagger->getTagsForObjects($ids);
+    /**
+     * Populate the result set with file tags
+     *
+     * @param array $fileList
+     * @param string $fileIdentifier identifier attribute name for values in $fileList
+     * @param ITagManager $tagManager
+     * @return array file list populated with tags
+     */
+    public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) {
+        $ids = [];
+        foreach ($fileList as $fileData) {
+            $ids[] = $fileData[$fileIdentifier];
+        }
+        $tagger = $tagManager->load('files');
+        $tags = $tagger->getTagsForObjects($ids);
 
-		if (!is_array($tags)) {
-			throw new \UnexpectedValueException('$tags must be an array');
-		}
+        if (!is_array($tags)) {
+            throw new \UnexpectedValueException('$tags must be an array');
+        }
 
-		// Set empty tag array
-		foreach ($fileList as $key => $fileData) {
-			$fileList[$key]['tags'] = [];
-		}
+        // Set empty tag array
+        foreach ($fileList as $key => $fileData) {
+            $fileList[$key]['tags'] = [];
+        }
 
-		if (!empty($tags)) {
-			foreach ($tags as $fileId => $fileTags) {
+        if (!empty($tags)) {
+            foreach ($tags as $fileId => $fileTags) {
 
-				foreach ($fileList as $key => $fileData) {
-					if ($fileId !== $fileData[$fileIdentifier]) {
-						continue;
-					}
+                foreach ($fileList as $key => $fileData) {
+                    if ($fileId !== $fileData[$fileIdentifier]) {
+                        continue;
+                    }
 
-					$fileList[$key]['tags'] = $fileTags;
-				}
-			}
-		}
+                    $fileList[$key]['tags'] = $fileTags;
+                }
+            }
+        }
 
-		return $fileList;
-	}
+        return $fileList;
+    }
 
-	/**
-	 * Sort the given file info array
-	 *
-	 * @param \OCP\Files\FileInfo[] $files files to sort
-	 * @param string $sortAttribute attribute to sort on
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @return \OCP\Files\FileInfo[] sorted files
-	 */
-	public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) {
-		$sortFunc = 'compareFileNames';
-		if ($sortAttribute === 'mtime') {
-			$sortFunc = 'compareTimestamp';
-		} else if ($sortAttribute === 'size') {
-			$sortFunc = 'compareSize';
-		}
-		usort($files, array(Helper::class, $sortFunc));
-		if ($sortDescending) {
-			$files = array_reverse($files);
-		}
-		return $files;
-	}
+    /**
+     * Sort the given file info array
+     *
+     * @param \OCP\Files\FileInfo[] $files files to sort
+     * @param string $sortAttribute attribute to sort on
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @return \OCP\Files\FileInfo[] sorted files
+     */
+    public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) {
+        $sortFunc = 'compareFileNames';
+        if ($sortAttribute === 'mtime') {
+            $sortFunc = 'compareTimestamp';
+        } else if ($sortAttribute === 'size') {
+            $sortFunc = 'compareSize';
+        }
+        usort($files, array(Helper::class, $sortFunc));
+        if ($sortDescending) {
+            $files = array_reverse($files);
+        }
+        return $files;
+    }
 }

apps/files/lib/Command/DeleteOrphanedFiles.php

Indentation +38 added lines, -38 removed lines

@@ -35,51 +35,51 @@
  */
 class DeleteOrphanedFiles extends Command {
 
-	const CHUNK_SIZE = 200;
+    const CHUNK_SIZE = 200;
 
-	/**
-	 * @var IDBConnection
-	 */
-	protected $connection;
+    /**
+     * @var IDBConnection
+     */
+    protected $connection;
 
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		parent::__construct();
-	}
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('files:cleanup')
-			->setDescription('cleanup filecache');
-	}
+    protected function configure() {
+        $this
+            ->setName('files:cleanup')
+            ->setDescription('cleanup filecache');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output) {
-		$deletedEntries = 0;
+    public function execute(InputInterface $input, OutputInterface $output) {
+        $deletedEntries = 0;
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('fc.fileid')
-			->from('filecache', 'fc')
-			->where($query->expr()->isNull('s.numeric_id'))
-			->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id'))
-			->setMaxResults(self::CHUNK_SIZE);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('fc.fileid')
+            ->from('filecache', 'fc')
+            ->where($query->expr()->isNull('s.numeric_id'))
+            ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id'))
+            ->setMaxResults(self::CHUNK_SIZE);
 
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('filecache')
-			->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid')));
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('filecache')
+            ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid')));
 
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
 
-		$output->writeln("$deletedEntries orphaned file cache entries deleted");
-	}
+        $output->writeln("$deletedEntries orphaned file cache entries deleted");
+    }
 
 }

apps/files/lib/Capabilities.php

Indentation +23 added lines, -23 removed lines

@@ -34,29 +34,29 @@
  * @package OCA\Files
  */
 class Capabilities implements ICapability {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * Capabilities constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * Capabilities constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'files' => [
-				'bigfilechunking' => true,
-				'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']),
-			],
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'files' => [
+                'bigfilechunking' => true,
+                'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']),
+            ],
+        ];
+    }
 }

apps/files/lib/BackgroundJob/CleanupFileLocks.php

Indentation +23 added lines, -23 removed lines

@@ -30,29 +30,29 @@
  */
 class CleanupFileLocks extends TimedJob {
 
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 5;
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 5;
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$lockingProvider = \OC::$server->getLockingProvider();
-		if($lockingProvider instanceof DBLockingProvider) {
-			$lockingProvider->cleanExpiredLocks();
-		}
-	}
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $lockingProvider = \OC::$server->getLockingProvider();
+        if($lockingProvider instanceof DBLockingProvider) {
+            $lockingProvider->cleanExpiredLocks();
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 */
 	public function run($argument) {
 		$lockingProvider = \OC::$server->getLockingProvider();
-		if($lockingProvider instanceof DBLockingProvider) {
+		if ($lockingProvider instanceof DBLockingProvider) {
 			$lockingProvider->cleanExpiredLocks();
 		}
 	}

apps/files/lib/BackgroundJob/DeleteOrphanedItems.php

Indentation +118 added lines, -118 removed lines

@@ -32,123 +32,123 @@
  */
 class DeleteOrphanedItems extends TimedJob {
 
-	const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var \OCP\ILogger */
-	protected $logger;
-
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 60;
-
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->logger = \OC::$server->getLogger();
-	}
-
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$this->cleanSystemTags();
-		$this->cleanUserTags();
-		$this->cleanComments();
-		$this->cleanCommentMarkers();
-	}
-
-	/**
-	 * Deleting orphaned system tag mappings
-	 *
-	 * @param string $table
-	 * @param string $idCol
-	 * @param string $typeCol
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanUp($table, $idCol, $typeCol) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('t1.' . $idCol)
-			->from($table, 't1')
-			->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
-			->andWhere($query->expr()->isNull('t2.fileid'))
-			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
-			->groupBy('t1.' . $idCol)
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete($table)
-			->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$result = $query->execute();
-			$deletedInLastChunk = 0;
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned system tag mappings
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanSystemTags() {
-		$deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype');
-		$this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned user tag mappings
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanUserTags() {
-		$deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type');
-		$this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned comments
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanComments() {
-		$deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type');
-		$this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned comment read markers
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanCommentMarkers() {
-		$deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type');
-		$this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
+    const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var \OCP\ILogger */
+    protected $logger;
+
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 60;
+
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+        $this->connection = \OC::$server->getDatabaseConnection();
+        $this->logger = \OC::$server->getLogger();
+    }
+
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $this->cleanSystemTags();
+        $this->cleanUserTags();
+        $this->cleanComments();
+        $this->cleanCommentMarkers();
+    }
+
+    /**
+     * Deleting orphaned system tag mappings
+     *
+     * @param string $table
+     * @param string $idCol
+     * @param string $typeCol
+     * @return int Number of deleted entries
+     */
+    protected function cleanUp($table, $idCol, $typeCol) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('t1.' . $idCol)
+            ->from($table, 't1')
+            ->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
+            ->andWhere($query->expr()->isNull('t2.fileid'))
+            ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
+            ->groupBy('t1.' . $idCol)
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete($table)
+            ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $result = $query->execute();
+            $deletedInLastChunk = 0;
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned system tag mappings
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanSystemTags() {
+        $deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype');
+        $this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned user tag mappings
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanUserTags() {
+        $deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type');
+        $this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned comments
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanComments() {
+        $deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type');
+        $this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned comment read markers
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanCommentMarkers() {
+        $deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type');
+        $this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -80,12 +80,12 @@
 		$deletedEntries = 0;
 
 		$query = $this->connection->getQueryBuilder();
-		$query->select('t1.' . $idCol)
+		$query->select('t1.'.$idCol)
 			->from($table, 't1')
 			->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
 			->andWhere($query->expr()->isNull('t2.fileid'))
-			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
-			->groupBy('t1.' . $idCol)
+			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.'.$idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
+			->groupBy('t1.'.$idCol)
 			->setMaxResults(self::CHUNK_SIZE);
 
 		$deleteQuery = $this->connection->getQueryBuilder();

apps/files/lib/BackgroundJob/ScanFiles.php

Indentation +69 added lines, -69 removed lines

@@ -36,80 +36,80 @@
  * @package OCA\Files\BackgroundJob
  */
 class ScanFiles extends \OC\BackgroundJob\TimedJob {
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IDBConnection */
-	private $dbConnection;
-	/** @var ILogger */
-	private $logger;
-	/** Amount of users that should get scanned per execution */
-	const USERS_PER_SESSION = 500;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IDBConnection */
+    private $dbConnection;
+    /** @var ILogger */
+    private $logger;
+    /** Amount of users that should get scanned per execution */
+    const USERS_PER_SESSION = 500;
 
-	/**
-	 * @param IConfig|null $config
-	 * @param IUserManager|null $userManager
-	 * @param IDBConnection|null $dbConnection
-	 * @param ILogger|null $logger
-	 */
-	public function __construct(IConfig $config = null,
-								IUserManager $userManager = null,
-								IDBConnection $dbConnection = null,
-								ILogger $logger = null) {
-		// Run once per 10 minutes
-		$this->setInterval(60 * 10);
+    /**
+     * @param IConfig|null $config
+     * @param IUserManager|null $userManager
+     * @param IDBConnection|null $dbConnection
+     * @param ILogger|null $logger
+     */
+    public function __construct(IConfig $config = null,
+                                IUserManager $userManager = null,
+                                IDBConnection $dbConnection = null,
+                                ILogger $logger = null) {
+        // Run once per 10 minutes
+        $this->setInterval(60 * 10);
 
-		if (is_null($userManager) || is_null($config)) {
-			$this->fixDIForJobs();
-		} else {
-			$this->config = $config;
-			$this->userManager = $userManager;
-			$this->logger = $logger;
-		}
-	}
+        if (is_null($userManager) || is_null($config)) {
+            $this->fixDIForJobs();
+        } else {
+            $this->config = $config;
+            $this->userManager = $userManager;
+            $this->logger = $logger;
+        }
+    }
 
-	protected function fixDIForJobs() {
-		$this->config = \OC::$server->getConfig();
-		$this->userManager = \OC::$server->getUserManager();
-		$this->logger = \OC::$server->getLogger();
-	}
+    protected function fixDIForJobs() {
+        $this->config = \OC::$server->getConfig();
+        $this->userManager = \OC::$server->getUserManager();
+        $this->logger = \OC::$server->getLogger();
+    }
 
-	/**
-	 * @param IUser $user
-	 */
-	protected function runScanner(IUser $user) {
-		try {
-			$scanner = new Scanner(
-					$user->getUID(),
-					$this->dbConnection,
-					$this->logger
-			);
-			$scanner->backgroundScan('');
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'files']);
-		}
-		\OC_Util::tearDownFS();
-	}
+    /**
+     * @param IUser $user
+     */
+    protected function runScanner(IUser $user) {
+        try {
+            $scanner = new Scanner(
+                    $user->getUID(),
+                    $this->dbConnection,
+                    $this->logger
+            );
+            $scanner->backgroundScan('');
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'files']);
+        }
+        \OC_Util::tearDownFS();
+    }
 
-	/**
-	 * @param $argument
-	 * @throws \Exception
-	 */
-	protected function run($argument) {
-		$offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0);
-		$users = $this->userManager->search('', self::USERS_PER_SESSION, $offset);
-		if (!count($users)) {
-			// No users found, reset offset and retry
-			$offset = 0;
-			$users = $this->userManager->search('', self::USERS_PER_SESSION);
-		}
+    /**
+     * @param $argument
+     * @throws \Exception
+     */
+    protected function run($argument) {
+        $offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0);
+        $users = $this->userManager->search('', self::USERS_PER_SESSION, $offset);
+        if (!count($users)) {
+            // No users found, reset offset and retry
+            $offset = 0;
+            $users = $this->userManager->search('', self::USERS_PER_SESSION);
+        }
 
-		$offset += self::USERS_PER_SESSION;
-		$this->config->setAppValue('files', 'cronjob_scan_files', $offset);
+        $offset += self::USERS_PER_SESSION;
+        $this->config->setAppValue('files', 'cronjob_scan_files', $offset);
 
-		foreach ($users as $user) {
-			$this->runScanner($user);
-		}
-	}
+        foreach ($users as $user) {
+            $this->runScanner($user);
+        }
+    }
 }

apps/files/appinfo/app.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
 
-\OCA\Files\App::getNavigationManager()->add(function () use ($l) {
+\OCA\Files\App::getNavigationManager()->add(function() use ($l) {
 	return [
 		'id' => 'files',
 		'appname' => 'files',
@@ -48,7 +48,7 @@ 
 	];
 });
 
-\OCA\Files\App::getNavigationManager()->add(function () use ($l) {
+\OCA\Files\App::getNavigationManager()->add(function() use ($l) {
 	return [
 		'id' => 'recent',
 		'appname' => 'files',

Indentation +14 added lines, -14 removed lines

@@ -39,23 +39,23 @@
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
 
 \OCA\Files\App::getNavigationManager()->add(function () use ($l) {
-	return [
-		'id' => 'files',
-		'appname' => 'files',
-		'script' => 'list.php',
-		'order' => 0,
-		'name' => $l->t('All files'),
-	];
+    return [
+        'id' => 'files',
+        'appname' => 'files',
+        'script' => 'list.php',
+        'order' => 0,
+        'name' => $l->t('All files'),
+    ];
 });
 
 \OCA\Files\App::getNavigationManager()->add(function () use ($l) {
-	return [
-		'id' => 'recent',
-		'appname' => 'files',
-		'script' => 'recentlist.php',
-		'order' => 2,
-		'name' => $l->t('Recent'),
-	];
+    return [
+        'id' => 'recent',
+        'appname' => 'files',
+        'script' => 'recentlist.php',
+        'order' => 2,
+        'name' => $l->t('Recent'),
+    ];
 });
 
 \OCP\Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig');