nextcloud / server

core/Controller/PreviewController.php

Indentation +154 added lines, -154 removed lines

@@ -39,158 +39,158 @@
 
 class PreviewController extends Controller {
 
-	/** @var string */
-	private $userId;
-
-	/** @var IRootFolder */
-	private $root;
-
-	/** @var IPreview */
-	private $preview;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * PreviewController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IPreview $preview
-	 * @param IRootFolder $root
-	 * @param string $userId
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IPreview $preview,
-								IRootFolder $root,
-								string $userId,
-								ITimeFactory $timeFactory
-	) {
-		parent::__construct($appName, $request);
-
-		$this->preview = $preview;
-		$this->root = $root;
-		$this->userId = $userId;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $file
-	 * @param int $x
-	 * @param int $y
-	 * @param bool $a
-	 * @param bool $forceIcon
-	 * @param string $mode
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getPreview (
-		string $file = '',
-		int $x = 32,
-		int $y = 32,
-		bool $a = false,
-		bool $forceIcon = true,
-		string $mode = 'fill'): Http\Response {
-
-		if ($file === '' || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$userFolder = $this->root->getUserFolder($this->userId);
-			$node = $userFolder->get($file);
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		return $this->fetchPreview($node, $x, $y, $a, $forceIcon, $mode);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param int $fileId
-	 * @param int $x
-	 * @param int $y
-	 * @param bool $a
-	 * @param bool $forceIcon
-	 * @param string $mode
-	 *
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getPreviewByFileId(
-		int $fileId = -1,
-		int $x = 32,
-		int $y = 32,
-		bool $a = false,
-		bool $forceIcon = true,
-		string $mode = 'fill') {
-
-		if ($fileId === -1 || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		$userFolder = $this->root->getUserFolder($this->userId);
-		$nodes = $userFolder->getById($fileId);
-
-		if (\count($nodes) === 0) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$node = array_pop($nodes);
-
-		return $this->fetchPreview($node, $x, $y, $a, $forceIcon, $mode);
-	}
-
-	/**
-	 * @param Node $node
-	 * @param int $x
-	 * @param int $y
-	 * @param bool $a
-	 * @param bool $forceIcon
-	 * @param string $mode
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	private function fetchPreview(
-		Node $node,
-		int $x,
-		int $y,
-		bool $a = false,
-		bool $forceIcon = true,
-		string $mode) : Http\Response {
-
-		if (!($node instanceof File) || (!$forceIcon && !$this->preview->isAvailable($node))) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-		if (!$node->isReadable()) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		try {
-			$f = $this->preview->getPreview($node, $x, $y, !$a, $mode);
-			$response = new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-
-			// Let cache this!
-			$response->addHeader('Pragma', 'public');
-
-			// Cache previews for 24H
-			$response->cacheFor(3600 * 24);
-			$expires = new \DateTime();
-			$expires->setTimestamp($this->timeFactory->getTime());
-			$expires->add(new \DateInterval('P1D'));
-			$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-
-			return $response;
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-	}
+    /** @var string */
+    private $userId;
+
+    /** @var IRootFolder */
+    private $root;
+
+    /** @var IPreview */
+    private $preview;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * PreviewController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IPreview $preview
+     * @param IRootFolder $root
+     * @param string $userId
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IPreview $preview,
+                                IRootFolder $root,
+                                string $userId,
+                                ITimeFactory $timeFactory
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->preview = $preview;
+        $this->root = $root;
+        $this->userId = $userId;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $file
+     * @param int $x
+     * @param int $y
+     * @param bool $a
+     * @param bool $forceIcon
+     * @param string $mode
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getPreview (
+        string $file = '',
+        int $x = 32,
+        int $y = 32,
+        bool $a = false,
+        bool $forceIcon = true,
+        string $mode = 'fill'): Http\Response {
+
+        if ($file === '' || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $userFolder = $this->root->getUserFolder($this->userId);
+            $node = $userFolder->get($file);
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        return $this->fetchPreview($node, $x, $y, $a, $forceIcon, $mode);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param int $fileId
+     * @param int $x
+     * @param int $y
+     * @param bool $a
+     * @param bool $forceIcon
+     * @param string $mode
+     *
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getPreviewByFileId(
+        int $fileId = -1,
+        int $x = 32,
+        int $y = 32,
+        bool $a = false,
+        bool $forceIcon = true,
+        string $mode = 'fill') {
+
+        if ($fileId === -1 || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        $userFolder = $this->root->getUserFolder($this->userId);
+        $nodes = $userFolder->getById($fileId);
+
+        if (\count($nodes) === 0) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $node = array_pop($nodes);
+
+        return $this->fetchPreview($node, $x, $y, $a, $forceIcon, $mode);
+    }
+
+    /**
+     * @param Node $node
+     * @param int $x
+     * @param int $y
+     * @param bool $a
+     * @param bool $forceIcon
+     * @param string $mode
+     * @return DataResponse|FileDisplayResponse
+     */
+    private function fetchPreview(
+        Node $node,
+        int $x,
+        int $y,
+        bool $a = false,
+        bool $forceIcon = true,
+        string $mode) : Http\Response {
+
+        if (!($node instanceof File) || (!$forceIcon && !$this->preview->isAvailable($node))) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+        if (!$node->isReadable()) {
+            return new DataResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        try {
+            $f = $this->preview->getPreview($node, $x, $y, !$a, $mode);
+            $response = new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+
+            // Let cache this!
+            $response->addHeader('Pragma', 'public');
+
+            // Cache previews for 24H
+            $response->cacheFor(3600 * 24);
+            $expires = new \DateTime();
+            $expires->setTimestamp($this->timeFactory->getTime());
+            $expires->add(new \DateInterval('P1D'));
+            $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+
+            return $response;
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl>
  *
@@ -88,7 +88,7 @@ 
 	 * @param string $mode
 	 * @return DataResponse|FileDisplayResponse
 	 */
-	public function getPreview (
+	public function getPreview(
 		string $file = '',
 		int $x = 32,
 		int $y = 32,

core/routes.php

Indentation +77 added lines, -77 removed lines

@@ -36,42 +36,42 @@ 
 
 $application = new Application();
 $application->registerRoutes($this, [
-	'routes' => [
-		['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'],
-		['name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'],
-		['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'],
-		['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'],
-		['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'],
-		['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'],
-		['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'],
-		['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'],
-		['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'],
-		['name' => 'login#tryLogin', 'url' => '/login', 'verb' => 'POST'],
-		['name' => 'login#confirmPassword', 'url' => '/login/confirm', 'verb' => 'POST'],
-		['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
-		['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
-		['name' => 'ClientFlowLogin#showAuthPickerPage', 'url' => '/login/flow', 'verb' => 'GET'],
-		['name' => 'ClientFlowLogin#redirectPage', 'url' => '/login/flow/redirect', 'verb' => 'GET'],
-		['name' => 'ClientFlowLogin#generateAppPassword', 'url' => '/login/flow', 'verb' => 'POST'],
-		['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
-		['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
-		['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
-		['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
-		['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
-		['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
-		['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
-		['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
-		['name' => 'AutoComplete#get', 'url' => 'autocomplete/get', 'verb' => 'GET'],
-		['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
-	],
-	'ocs' => [
-		['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
-		['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
-		['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
-		['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
-	],
+    'routes' => [
+        ['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'],
+        ['name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'],
+        ['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'],
+        ['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'],
+        ['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'],
+        ['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'],
+        ['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'],
+        ['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'],
+        ['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'],
+        ['name' => 'login#tryLogin', 'url' => '/login', 'verb' => 'POST'],
+        ['name' => 'login#confirmPassword', 'url' => '/login/confirm', 'verb' => 'POST'],
+        ['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
+        ['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLogin#showAuthPickerPage', 'url' => '/login/flow', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLogin#redirectPage', 'url' => '/login/flow/redirect', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLogin#generateAppPassword', 'url' => '/login/flow', 'verb' => 'POST'],
+        ['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
+        ['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
+        ['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
+        ['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
+        ['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
+        ['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
+        ['name' => 'AutoComplete#get', 'url' => 'autocomplete/get', 'verb' => 'GET'],
+        ['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
+    ],
+    'ocs' => [
+        ['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
+        ['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
+        ['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
+        ['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
+    ],
 ]);
 
 // Post installation check
@@ -80,15 +80,15 @@ 
 // Core ajax actions
 // Search
 $this->create('search_ajax_search', '/core/search')
-	->actionInclude('core/search/ajax/search.php');
+    ->actionInclude('core/search/ajax/search.php');
 // Routing
 $this->create('core_ajax_update', '/core/ajax/update.php')
-	->actionInclude('core/ajax/update.php');
+    ->actionInclude('core/ajax/update.php');
 
 // File routes
 $this->create('files.viewcontroller.showFile', '/f/{fileid}')->action(function($urlParams) {
-	$app = new \OCA\Files\AppInfo\Application($urlParams);
-	$app->dispatch('ViewController', 'index');
+    $app = new \OCA\Files\AppInfo\Application($urlParams);
+    $app->dispatch('ViewController', 'index');
 });
 
 // Call routes
@@ -97,57 +97,57 @@ 
  * @suppress PhanUndeclaredClassMethod
  */
 $this->create('spreed.pagecontroller.showCall', '/call/{token}')->action(function($urlParams) {
-	if (class_exists(\OCA\Spreed\AppInfo\Application::class, false)) {
-		$app = new \OCA\Spreed\AppInfo\Application($urlParams);
-		$app->dispatch('PageController', 'index');
-	} else {
-		throw new \OC\HintException('App spreed is not enabled');
-	}
+    if (class_exists(\OCA\Spreed\AppInfo\Application::class, false)) {
+        $app = new \OCA\Spreed\AppInfo\Application($urlParams);
+        $app->dispatch('PageController', 'index');
+    } else {
+        throw new \OC\HintException('App spreed is not enabled');
+    }
 });
 
 // Sharing routes
 $this->create('files_sharing.sharecontroller.showShare', '/s/{token}')->action(function($urlParams) {
-	if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
-		$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
-		$app->dispatch('ShareController', 'showShare');
-	} else {
-		throw new \OC\HintException('App file sharing is not enabled');
-	}
+    if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
+        $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
+        $app->dispatch('ShareController', 'showShare');
+    } else {
+        throw new \OC\HintException('App file sharing is not enabled');
+    }
 });
 $this->create('files_sharing.sharecontroller.authenticate', '/s/{token}/authenticate')->post()->action(function($urlParams) {
-	if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
-		$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
-		$app->dispatch('ShareController', 'authenticate');
-	} else {
-		throw new \OC\HintException('App file sharing is not enabled');
-	}
+    if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
+        $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
+        $app->dispatch('ShareController', 'authenticate');
+    } else {
+        throw new \OC\HintException('App file sharing is not enabled');
+    }
 });
 $this->create('files_sharing.sharecontroller.showAuthenticate', '/s/{token}/authenticate')->get()->action(function($urlParams) {
-	if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
-		$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
-		$app->dispatch('ShareController', 'showAuthenticate');
-	} else {
-		throw new \OC\HintException('App file sharing is not enabled');
-	}
+    if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
+        $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
+        $app->dispatch('ShareController', 'showAuthenticate');
+    } else {
+        throw new \OC\HintException('App file sharing is not enabled');
+    }
 });
 $this->create('files_sharing.sharecontroller.downloadShare', '/s/{token}/download')->get()->action(function($urlParams) {
-	if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
-		$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
-		$app->dispatch('ShareController', 'downloadShare');
-	} else {
-		throw new \OC\HintException('App file sharing is not enabled');
-	}
+    if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
+        $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
+        $app->dispatch('ShareController', 'downloadShare');
+    } else {
+        throw new \OC\HintException('App file sharing is not enabled');
+    }
 });
 $this->create('files_sharing.publicpreview.directLink', '/s/{token}/preview')->get()->action(function($urlParams) {
-	if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
-		$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
-		$app->dispatch('PublicPreviewController', 'directLink');
-	} else {
-		throw new \OC\HintException('App file sharing is not enabled');
-	}
+    if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
+        $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
+        $app->dispatch('PublicPreviewController', 'directLink');
+    } else {
+        throw new \OC\HintException('App file sharing is not enabled');
+    }
 });
 
 // used for heartbeat
 $this->create('heartbeat', '/heartbeat')->action(function(){
-	// do nothing
+    // do nothing
 });