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

use oc_filesystem::getlocalfile instead of manually trying to get the correct local file when creating album covers 

fixes broken album covers on shared files
This commit is contained in:
Robin Appelman 2012-01-26 18:12:59 +01:00
parent 935b828427
commit 266fbb442e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/gallery/ajax/cover.php
View File

@ -70,11 +70,11 @@ $x = min((int)($x/($box_size/$result->numRows())), $result->numRows()-1); // get
$result->seek($x); // never throws
$path = $result->fetchRow();
$path = $path['file_path'];
$tmp = OC::$CONFIG_DATADIRECTORY . $path;
$imagesize = getimagesize($tmp);
$imagePath = OC_Filesystem::getLocalFile($img);
$imagesize = getimagesize($imagePath);
header('Content-Type: image/png');
$image = CroppedThumbnail($tmp, $box_size, $box_size);
$image = CroppedThumbnail($imagePath, $box_size, $box_size);
imagepng($image);
imagedestroy($image);

3
apps/gallery/lib/scanner.php
View File

@ -82,7 +82,8 @@ class OC_Gallery_Scanner {
$file_count = min(count($files), 10);
$thumbnail = imagecreatetruecolor($file_count*200, 200);
for ($i = 0; $i < $file_count; $i++) {
CroppedThumbnail(OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/files/'.$files[$i], 200, 200, $thumbnail, $i*200);
$imagePath = OC_Filesystem::getLocalFile($files[$i]);
CroppedThumbnail($imagePath, 200, 200, $thumbnail, $i*200);
}
imagepng($thumbnail, OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/' . $albumName.'.png');
}