Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 03:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed redundant maximagesize = INF statements

Browse source
This commit is contained in:
Marek Bachmann 2022-11-30 05:17:48 +01:00
parent 00808326c2
commit 79235b6db1
4 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/photos.php
View file

@ -656,10 +656,6 @@ function photos_post(App $a)
$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
if ($maximagesize == 0) {
$maximagesize = INF;
}
if ($maximagesize && ($filesize > $maximagesize)) { if ($maximagesize && ($filesize > $maximagesize)) {
DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize))); DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
@unlink($src); @unlink($src);

12
src/Model/Photo.php
View file

@ -577,11 +577,7 @@ class Photo
$filesize = strlen($image->asString()); $filesize = strlen($image->asString());
$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
if ($maximagesize == 0) { if ($maximagesize && ($filesize > $maximagesize)) {
$maximagesize = INF;
}
if (!empty($maximagesize) && ($filesize > $maximagesize)) {
Logger::info('Avatar exceeds image limit', ['uid' => $uid, 'cid' => $cid, 'maximagesize' => $maximagesize, 'size' => $filesize, 'type' => $image->getType()]); Logger::info('Avatar exceeds image limit', ['uid' => $uid, 'cid' => $cid, 'maximagesize' => $maximagesize, 'size' => $filesize, 'type' => $image->getType()]);
if ($image->getType() == 'image/gif') { if ($image->getType() == 'image/gif') {
$image->toStatic(); $image->toStatic();
@ -973,11 +969,7 @@ class Photo
$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
if ($maximagesize == 0) { if ($maximagesize && ($filesize > $maximagesize)) {
$maximagesize = INF;
}
if (!empty($maximagesize) && ($filesize > $maximagesize)) {
// Scale down to multiples of 640 until the maximum size isn't exceeded anymore // Scale down to multiples of 640 until the maximum size isn't exceeded anymore
foreach ([5120, 2560, 1280, 640] as $pixels) { foreach ([5120, 2560, 1280, 640] as $pixels) {
if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) { if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) {

6
src/Module/Media/Photo/Upload.php
View file

@ -171,11 +171,7 @@ class Upload extends \Friendica\BaseModule
$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
if ($maximagesize == 0) { if ($maximagesize && $filesize > $maximagesize) {
$maximagesize = INF;
}
if (!empty($maximagesize) && $filesize > $maximagesize) {
// Scale down to multiples of 640 until the maximum size isn't exceeded anymore // Scale down to multiples of 640 until the maximum size isn't exceeded anymore
foreach ([5120, 2560, 1280, 640] as $pixels) { foreach ([5120, 2560, 1280, 640] as $pixels) {
if ($filesize > $maximagesize && max($width, $height) > $pixels) { if ($filesize > $maximagesize && max($width, $height) > $pixels) {

4
src/Module/Settings/Profile/Photo/Index.php
View file

@ -55,10 +55,6 @@ class Index extends BaseSettings
$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize', 0)); $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize', 0));
if ($maximagesize == 0) {
$maximagesize = INF;
}
if ($maximagesize && $filesize > $maximagesize) { if ($maximagesize && $filesize > $maximagesize) {
DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize))); DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
@unlink($src); @unlink($src);