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

Merge pull request #13449 from owncloud/image_preview_limit 

add config-option for an image's maximum filesize when generating previews
This commit is contained in:
Thomas Müller 2015-01-22 23:02:38 +01:00
parent cb8440c55a 3af8bde949
commit 5776bfec05
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/config.sample.php
View File

@ -621,6 +621,18 @@ $CONFIG = array(
* original size. A value of ``1`` or ``null`` disables scaling. * original size. A value of ``1`` or ``null`` disables scaling.
*/ */
'preview_max_scale_factor' => 10, 'preview_max_scale_factor' => 10,
/**
* max file size for generating image previews with imagegd (default behaviour)
* If the image is bigger, it'll try other preview generators,
* but will most likely show the default mimetype icon
*
* Value represents the maximum filesize in megabytes
* Default is 50
* Set to -1 for no limit
*/
'preview_max_filesize_image' => 50,
/** /**
* custom path for LibreOffice/OpenOffice binary * custom path for LibreOffice/OpenOffice binary
*/ */

7
lib/private/preview/image.php
View File

@ -26,6 +26,13 @@ class Image extends Provider {
return false; return false;
} }
$maxSizeForImages = \OC::$server->getConfig()->getSystemValue('preview_max_filesize_image', 50);
$size = $fileInfo->getSize();
if ($maxSizeForImages !== -1 && $size > ($maxSizeForImages * 1024 * 1024)) {
return false;
}
$image = new \OC_Image(); $image = new \OC_Image();
if($fileInfo['encrypted'] === true) { if($fileInfo['encrypted'] === true) {