mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add url parameter to control whether previews should return 404 when the mimetype is unsupported

This commit is contained in:
Robin Appelman 2014-02-21 14:06:15 +01:00
parent 3f52eb073d
commit 4715fb12c8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/files/js/files.js
View File

@ -786,6 +786,7 @@ Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
} }
previewURL = previewURL.replace('(', '%28'); previewURL = previewURL.replace('(', '%28');
previewURL = previewURL.replace(')', '%29'); previewURL = previewURL.replace(')', '%29');
previewURL += '&always=0';
// preload image to prevent delay // preload image to prevent delay
// this will make the browser cache the image // this will make the browser cache the image

3
core/ajax/preview.php
View File

@ -11,6 +11,7 @@ $file = array_key_exists('file', $_GET) ? (string)$_GET['file'] : '';
$maxX = array_key_exists('x', $_GET) ? (int)$_GET['x'] : '36'; $maxX = array_key_exists('x', $_GET) ? (int)$_GET['x'] : '36';
$maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '36'; $maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '36';
$scalingUp = array_key_exists('scalingup', $_GET) ? (bool)$_GET['scalingup'] : true; $scalingUp = array_key_exists('scalingup', $_GET) ? (bool)$_GET['scalingup'] : true;
$always = array_key_exists('always', $_GET) ? (bool)$_GET['always'] : true;
if ($file === '') { if ($file === '') {
//400 Bad Request //400 Bad Request
@ -28,7 +29,7 @@ if ($maxX === 0 || $maxY === 0) {
try { try {
$preview = new \OC\Preview(\OC_User::getUser(), 'files'); $preview = new \OC\Preview(\OC_User::getUser(), 'files');
if (!$preview->isMimeSupported(\OC\Files\Filesystem::getMimeType($file))) { if (!$always and !$preview->isMimeSupported(\OC\Files\Filesystem::getMimeType($file))) {
\OC_Response::setStatus(404); \OC_Response::setStatus(404);
} else { } else {
$preview->setFile($file); $preview->setFile($file);