diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-10-14 19:27:14 +0200 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-11-03 14:00:33 +0100 |
commit | 02525fd98bb3994199ebd877968574610f6898ee (patch) | |
tree | cb37f6f475acd0d353be95eae0e28807c0d6257f /core/ajax | |
parent | c8ff9fb00e6ce65666bac00e0cc2a8c6f4da4b6c (diff) | |
download | nextcloud-server-02525fd98bb3994199ebd877968574610f6898ee.tar.gz nextcloud-server-02525fd98bb3994199ebd877968574610f6898ee.zip |
Move preview endpoint to controller
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'core/ajax')
-rw-r--r-- | core/ajax/preview.php | 75 | ||||
-rw-r--r-- | core/ajax/preview2.php | 40 |
2 files changed, 0 insertions, 115 deletions
diff --git a/core/ajax/preview.php b/core/ajax/preview.php deleted file mode 100644 index aac623b5ce6..00000000000 --- a/core/ajax/preview.php +++ /dev/null @@ -1,75 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Georg Ehrke <georg@owncloud.com> - * @author Joas Schilling <coding@schilljs.com> - * @author Lukas Reschke <lukas@statuscode.ch> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin Appelman <robin@icewind.nl> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ -\OC_Util::checkLoggedIn(); -\OC::$server->getSession()->close(); - -$file = array_key_exists('file', $_GET) ? (string)$_GET['file'] : ''; -$maxX = array_key_exists('x', $_GET) ? (int)$_GET['x'] : '32'; -$maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '32'; -$scalingUp = array_key_exists('scalingup', $_GET) ? (bool)$_GET['scalingup'] : true; -$keepAspect = array_key_exists('a', $_GET) ? true : false; -$always = array_key_exists('forceIcon', $_GET) ? (bool)$_GET['forceIcon'] : true; -$mode = array_key_exists('mode', $_GET) ? $_GET['mode'] : 'fill'; - -if ($file === '') { - //400 Bad Request - \OC_Response::setStatus(400); - \OCP\Util::writeLog('core-preview', 'No file parameter was passed', \OCP\Util::DEBUG); - exit; -} - -if ($maxX === 0 || $maxY === 0) { - //400 Bad Request - \OC_Response::setStatus(400); - \OCP\Util::writeLog('core-preview', 'x and/or y set to 0', \OCP\Util::DEBUG); - exit; -} - -$folder = \OC::$server->getUserFolder(); - -try { - $file = $folder->get($file); -} catch (\OCP\Files\NotFoundException $e) { - return \OC_Response::setStatus(404); -} - -if (!$file instanceof OCP\Files\File || !$always && !\OC::$server->getPreviewManager()->isAvailable($file)) { - \OC_Response::setStatus(404); -} else if (!$info->isReadable()) { - \OC_Response::setStatus(403); -} else { - $preview = new \OC\Preview2( - \OC::$server->getRootFolder(), - \OC::$server->getConfig(), - \OC::$server->getPreviewManager(), - $file - ); - $image = $preview->getPreview($maxX, $maxY, !$keepAspect, $mode); - - header('Content-Type: ' . $image->getMimeType()); - echo $image->getContent(); -} diff --git a/core/ajax/preview2.php b/core/ajax/preview2.php deleted file mode 100644 index 7ac50282190..00000000000 --- a/core/ajax/preview2.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php - -\OC_Util::checkLoggedIn(); -\OC::$server->getSession()->close(); - -$file = array_key_exists('file', $_GET) ? (string)$_GET['file'] : ''; -$maxX = array_key_exists('x', $_GET) ? (int)$_GET['x'] : '32'; -$maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '32'; -$keepAspect = array_key_exists('a', $_GET) ? true : false; -$always = array_key_exists('forceIcon', $_GET) ? (bool)$_GET['forceIcon'] : true; -$mode = array_key_exists('mode', $_GET) ? $_GET['mode'] : 'fill'; - -if ($file === '') { - //400 Bad Request - \OC_Response::setStatus(400); - \OCP\Util::writeLog('core-preview', 'No file parameter was passed', \OCP\Util::DEBUG); - exit; -} - -if ($maxX === 0 || $maxY === 0) { - //400 Bad Request - \OC_Response::setStatus(400); - \OCP\Util::writeLog('core-preview', 'x and/or y set to 0', \OCP\Util::DEBUG); - exit; -} - -$userFolder = \OC::$server->getUserFolder(); -$file = $userFolder->get($file); - -$p = new \OC\Preview2(\OC::$server->getRootFolder(), - \OC::$server->getConfig(), - \OC::$server->getPreviewManager(), - $file, - \OC::$server->getAppDataDir('preview')); - -$image = $p->getPreview($maxX, $maxY, !$keepAspect, $mode); - -header('Content-Type: ' . $image->getMimeType()); -echo $image->getContent(); - |