clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Integrated isnumeric check to limit comparison condition

This commit is contained in:
Marek Bachmann 2022-11-26 23:25:11 +01:00
parent 765b50bde8
commit 54289b2d08
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mod/photos.php
View File

@ -914,17 +914,15 @@ function photos_content(App $a)
'$submit' => DI::l10n()->t('Submit'), '$submit' => DI::l10n()->t('Submit'),
]); ]);
// Determine which setting actually limits upload size of images: limit of Friendica ('maximagesize') or upload_max_filesize
$maximagesize_Mbytes = 0; $maximagesize_Mbytes = 0;
// Get the relevant size limits for uploads. Abbreviated var names: MaxImageSize -> mis; upload_max_filesize -> umf // Get the relevant size limits for uploads. Abbreviated var names: MaxImageSize -> mis; upload_max_filesize -> umf
$mis_bytes = DI::config()->get('system', 'maximagesize'); $mis_bytes = DI::config()->get('system', 'maximagesize');
$umf_bytes = Strings::getBytesFromShorthand(get_cfg_var('upload_max_filesize')); $umf_bytes = Strings::getBytesFromShorthand(ini_get('upload_max_filesize'));
// When PHP is configured with upload_max_filesize less than maximagesize provide this lower limit.
(($umf_bytes < $mis_bytes) || ! is_numeric($mis_bytes)) ?
($maximagesize_Mbytes = ($umf_bytes / (10 ** 6))) : ($maximagesize_Mbytes = ($mis_bytes / (10 ** 6)));
if (is_numeric($mis_bytes)) {
// When PHP is configured with upload_max_filesize less than maximagesize provide this lower limit.
($umf_bytes < $mis_bytes) ?
($maximagesize_Mbytes = ($umf_bytes / (10 ** 6))) : ($maximagesize_Mbytes = ($mis_bytes / (10 ** 6)));
}
$usage_message = DI::l10n()->t('The maximum accepted image size is %.3g MB', $maximagesize_Mbytes); $usage_message = DI::l10n()->t('The maximum accepted image size is %.3g MB', $maximagesize_Mbytes);