mirror of
https://github.com/friendica/friendica
synced 2024-12-22 23:20:16 +00:00
Better formatting
This commit is contained in:
parent
f4d49e561c
commit
f88722bf7f
1 changed files with 9 additions and 13 deletions
|
@ -914,22 +914,18 @@ function photos_content(App $a)
|
||||||
'$submit' => DI::l10n()->t('Submit'),
|
'$submit' => DI::l10n()->t('Submit'),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
/* This block determines which setting actually limits upload size of images:
|
// Determine which setting actually limits upload size of images: limit of Friendica ('maximagesize') or upload_max_filesize
|
||||||
* limit of Friendica ('maximagesize') or upload_max_filesize
|
|
||||||
* and outputs the lower one.
|
|
||||||
*/
|
|
||||||
$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(get_cfg_var('upload_max_filesize'));
|
|
||||||
|
|
||||||
if (is_numeric($mis_bytes)) {
|
if (is_numeric($mis_bytes)) {
|
||||||
// When PHP is configured with upload_max_filesize less than maximagesize provide this lower limit.
|
// When PHP is configured with upload_max_filesize less than maximagesize provide this lower limit.
|
||||||
($umf_bytes < $mis_bytes) ?
|
($umf_bytes < $mis_bytes) ?
|
||||||
($maximagesize_Mbytes = ($umf_bytes / (10 ** 6))) : ($maximagesize_Mbytes = ($mis_bytes / (10 ** 6)));
|
($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);
|
||||||
|
|
||||||
$tpl = Renderer::getMarkupTemplate('photos_upload.tpl');
|
$tpl = Renderer::getMarkupTemplate('photos_upload.tpl');
|
||||||
|
|
Loading…
Reference in a new issue