Friendica/friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2024-06-30 16:13:46 +00:00

Merge pull request 'JS Uploader: "jpg" added to the list of allowed file extensions' (#1515) from heluecht/friendica-addons:jsupload into 2024.06-rc

Browse source 
Reviewed-on: https://git.friendi.ca/friendica/friendica-addons/pulls/1515
This commit is contained in:
Tobias Diekershoff 2024-06-16 16:47:11 +02:00
parent 7f0cf2527c af868f45ab
commit ed07c987a6
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
js_upload/js_upload.php
View file

@ -50,7 +50,11 @@ function js_upload_post_init(array &$b)
// list of valid extensions
$allowedExtensions = [];
foreach (Images::IMAGETYPES as $type) {
$allowedExtensions[] = image_type_to_extension($type, false);
$extension = image_type_to_extension($type, false);
if ($extension == 'jpeg') {
$allowedExtensions[] = 'jpg';
}
$allowedExtensions[] = $extension;
}
// max file size in bytes
@ -216,9 +220,9 @@ class qqFileUploader
return ['error' => DI::l10n()->t('Uploaded file is empty')];
}
// if ($size > $this->sizeLimit) {
// return array('error' => DI::l10n()->t('Uploaded file is too large'));
// }
// if ($size > $this->sizeLimit) {
// return array('error' => DI::l10n()->t('Uploaded file is too large'));
// }
$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));