From f88722bf7f00048a0b6222c677120da548668020 Mon Sep 17 00:00:00 2001 From: Marek Bachmann Date: Sat, 26 Nov 2022 21:47:55 +0100 Subject: [PATCH] Better formatting --- mod/photos.php | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index c2f0b6291e..d5689f5fd5 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -914,22 +914,18 @@ function photos_content(App $a) '$submit' => DI::l10n()->t('Submit'), ]); - /* This block determines which setting actually limits upload size of images: - * limit of Friendica ('maximagesize') or upload_max_filesize - * and outputs the lower one. - */ + // Determine which setting actually limits upload size of images: limit of Friendica ('maximagesize') or upload_max_filesize $maximagesize_Mbytes = 0; - { - // Get the relevant size limits for uploads. Abbreviated var names: MaxImageSize -> mis; upload_max_filesize -> umf - $mis_bytes = DI::config()->get('system', 'maximagesize'); - $umf_bytes = Strings::getBytesFromShorthand(get_cfg_var('upload_max_filesize')); + // Get the relevant size limits for uploads. Abbreviated var names: MaxImageSize -> mis; upload_max_filesize -> umf + $mis_bytes = DI::config()->get('system', 'maximagesize'); + $umf_bytes = Strings::getBytesFromShorthand(get_cfg_var('upload_max_filesize')); - 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))); - } + 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); $tpl = Renderer::getMarkupTemplate('photos_upload.tpl');