GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[Embed] Added support for inline images

Browse Source
This commit is contained in:
Miguel Dantas 2019-08-19 01:40:31 +01:00 committed by Diogo Peralta Cordeiro
parent 0b30d932fc
commit 8e7ab891a5
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/Embed/EmbedPlugin.php
View File

@ -133,7 +133,7 @@ class EmbedPlugin extends Plugin
if (substr($info->image, 0, 4) === 'data') { if (substr($info->image, 0, 4) === 'data') {
// Inline image // Inline image
$img_data = base64_decode(substr($info->image, stripos($info->image, 'base64,') + 7)); $img_data = base64_decode(substr($info->image, stripos($info->image, 'base64,') + 7));
list($filename, $_, $_) = $this->validateAndWriteImage($img_data); list($filename, , ) = $this->validateAndWriteImage($img_data);
// Use a file URI for images, as file_embed can't store a filename // Use a file URI for images, as file_embed can't store a filename
$metadata->thumbnail_url = 'file://' . File_thumbnail::path($filename); $metadata->thumbnail_url = 'file://' . File_thumbnail::path($filename);
} else { } else {
@ -509,18 +509,18 @@ class EmbedPlugin extends Plugin
} }
/** /**
* Validate that $img_data is a valid image before writing it to * Validate that $imgData is a valid image before writing it to
* disk, as well as resizing it to at most $this->thumbnail_width * disk, as well as resizing it to at most $this->thumbnail_width
* by $this->thumbnail_height * by $this->thumbnail_height
* *
* @param string $img_data - The image data to validate. Taken by reference to avoid copying * @param $imgData - The image data to validate. Taken by reference to avoid copying
* @param string|null $url - The url where the image came from, to fetch metadata * @param string|null $url - The url where the image came from, to fetch metadata
* @param array|null $headers - The headers possible previous request to $url * @param array|null $headers - The headers possible previous request to $url
* @param int|null $file_id - The id of the file this image belongs to, used for logging * @param int|null $file_id - The id of the file this image belongs to, used for logging
*/ */
protected function validateAndWriteImage(string &$img_data, ?string $url = null, ?string $headers = null, ?int $file_id = 0) : array protected function validateAndWriteImage(&$imgData, $url = null, $headers = null, $file_id = 0) : array
{ {
$info = @getimagesizefromstring($img_data); $info = @getimagesizefromstring($imgData);
// array indexes documented on php.net: // array indexes documented on php.net:
// https://php.net/manual/en/function.getimagesize.php // https://php.net/manual/en/function.getimagesize.php
if ($info === false) { if ($info === false) {
@ -531,7 +531,7 @@ class EmbedPlugin extends Plugin
$width = min($info[0], $this->thumbnail_width); $width = min($info[0], $this->thumbnail_width);
$height = min($info[1], $this->thumbnail_height); $height = min($info[1], $this->thumbnail_height);
$filehash = hash(File::FILEHASH_ALG, $img_data); $filehash = hash(File::FILEHASH_ALG, $imgData);
try { try {
if (!empty($url)) { if (!empty($url)) {
@ -611,8 +611,8 @@ class EmbedPlugin extends Plugin
$headers = array_change_key_case($headers, CASE_LOWER); $headers = array_change_key_case($headers, CASE_LOWER);
try { try {
$isImage = $this->isRemoteImage($url, $headers); $is_image = $this->isRemoteImage($url, $headers);
if ($isImage == true) { if ($is_image == true) {
$max_size = common_get_preferred_php_upload_limit(); $max_size = common_get_preferred_php_upload_limit();
$file_size = $this->getRemoteFileSize($url, $headers); $file_size = $this->getRemoteFileSize($url, $headers);
if (($file_size!=false) && ($file_size > $max_size)) { if (($file_size!=false) && ($file_size > $max_size)) {
@ -633,9 +633,9 @@ class EmbedPlugin extends Plugin
$thumbnail->file_id, $thumbnail->file_id,
$url $url
)); ));
$img_data = HTTPClient::quickGet($url); $imgData = HTTPClient::quickGet($url);
list($filename, $width, $height) = $this->validateAndWriteImage($img_data, $url, $headers, list($filename, $width, $height) = $this->validateAndWriteImage($imgData, $url, $headers,
$thumbnail->file_id); $thumbnail->file_id);
} }