tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Added getBytesFromShorthand at the remaining places.

Browse source
This commit is contained in:
Marek Bachmann 2022-11-30 04:13:10 +01:00
parent 97a3587e58
commit bb9afc520b
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@ use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\DI;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\BaseApi; use Friendica\Module\BaseApi;
@ -168,7 +169,11 @@ class Upload extends \Friendica\BaseModule
$width = $image->getWidth(); $width = $image->getWidth();
$height = $image->getHeight(); $height = $image->getHeight();
$maximagesize = $this->config->get('system', 'maximagesize'); $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
if ($maximagesize == 0) {
$maximagesize = INF;
}
if (!empty($maximagesize) && $filesize > $maximagesize) { 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

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

@ -53,7 +53,11 @@ class Index extends BaseSettings
$filetype = Images::getMimeTypeBySource($src, $filename, $filetype); $filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
$maximagesize = 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)));