eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[CORE] Fix bug where we we're losing track of a file, in case the image needed to be reencoded

Browse Source
This commit is contained in:
Miguel Dantas 2019-07-15 00:03:32 +01:00 committed by Diogo Cordeiro
parent 4863bd30d7
commit ee8bac9ad7
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/imagefile.php
View File

@ -278,7 +278,7 @@ class ImageFile extends MediaFile
} }
if (Event::handle('StartResizeImageFile', array($this, $outpath, $box))) { if (Event::handle('StartResizeImageFile', array($this, $outpath, $box))) {
$this->resizeToFile($outpath, $box); $outpath = $this->resizeToFile($outpath, $box);
} }
if (!file_exists($outpath)) { if (!file_exists($outpath)) {
@ -304,7 +304,7 @@ class ImageFile extends MediaFile
* @param array $box * @param array $box
* @throws Exception * @throws Exception
*/ */
protected function resizeToFile($outpath, array $box) protected function resizeToFile(string $outpath, array $box) : string
{ {
$old_limit = ini_set('memory_limit', common_config('attachments', 'memory_limit')); $old_limit = ini_set('memory_limit', common_config('attachments', 'memory_limit'));
$image_src = null; $image_src = null;
@ -373,12 +373,6 @@ class ImageFile extends MediaFile
); );
$type = $this->preferredType(); $type = $this->preferredType();
$ext = image_type_to_extension($type, true);
// Decoding returns null if the file is in the old format
$filename = MediaFile::decodeFilename(basename($outpath));
// Encoding null makes the file use 'untitled', and also replaces the extension
$outfilename = MediaFile::encodeFilename($filename, $this->filehash, $ext);
$outpath = dirname($outpath) . DIRECTORY_SEPARATOR . $outfilename;
switch ($type) { switch ($type) {
case IMAGETYPE_GIF: case IMAGETYPE_GIF:
@ -398,6 +392,8 @@ class ImageFile extends MediaFile
imagedestroy($image_src); imagedestroy($image_src);
imagedestroy($image_dest); imagedestroy($image_dest);
ini_set('memory_limit', $old_limit); // Restore the old memory limit ini_set('memory_limit', $old_limit); // Restore the old memory limit
return $outpath;
} }
public function unlink() public function unlink()
@ -539,6 +535,7 @@ class ImageFile extends MediaFile
// Throws FileNotFoundException or FileNotStoredLocallyException // Throws FileNotFoundException or FileNotStoredLocallyException
$this->filepath = $this->fileRecord->getFileOrThumbnailPath(); $this->filepath = $this->fileRecord->getFileOrThumbnailPath();
$filename = basename($this->filepath);
if ($width === null) { if ($width === null) {
$width = common_config('thumbnail', 'width'); $width = common_config('thumbnail', 'width');
@ -575,9 +572,14 @@ class ImageFile extends MediaFile
return $thumb; return $thumb;
} }
$extension = File::guessMimeExtension($this->mimetype); $type = $this->preferredType();
$outname = "thumb-{$this->fileRecord->getID()}-{$width}x{$height}-{$this->filename}"; $ext = image_type_to_extension($type, true);
$outpath = File_thumbnail::path($outname); // Decoding returns null if the file is in the old format
$filename = MediaFile::decodeFilename(basename($this->filepath));
// Encoding null makes the file use 'untitled', and also replaces the extension
$outfilename = MediaFile::encodeFilename($filename, $this->filehash, $ext);
$outpath = File_thumbnail::path(
"thumb-{$this->fileRecord->id}-{$box['width']}x{$box['height']}-{$outfilename}");
// The boundary box for our resizing // The boundary box for our resizing
$box = array('width'=>$width, 'height'=>$height, $box = array('width'=>$width, 'height'=>$height,
@ -595,7 +597,7 @@ class ImageFile extends MediaFile
} }
common_debug(sprintf( common_debug(sprintf(
'Generating a thumbnail of File id==%u of size %ux%u', 'Generating a thumbnail of File id=%u of size %ux%u',
$this->fileRecord->getID(), $this->fileRecord->getID(),
$width, $width,
$height $height