badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[upload] cleaner upload size counters

Browse source
This commit is contained in:
Shish 2024-01-08 19:38:23 +00:00
parent 29fde1388a
commit 9d80b1470c
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/upload/theme.php
View file

@ -68,8 +68,9 @@ class UploadTheme extends Themelet
$form, $form,
SMALL( SMALL(
"(", "(",
$max_size > 0 ? "Per-file limit: $max_kb" : null, $max_size > 0 ? "File limit $max_kb" : null,
$max_total_size > 0 ? " / Total limit: $max_total_kb" : null, $max_size > 0 && $max_total_size > 0 ? " / " : null,
$max_total_size > 0 ? "Total limit $max_total_kb" : null,
" / Current total: ", " / Current total: ",
SPAN(["id" => "upload_size_tracker"], "0KB"), SPAN(["id" => "upload_size_tracker"], "0KB"),
")" ")"
@ -311,7 +312,7 @@ class UploadTheme extends Themelet
$max_size = $config->get_int(UploadConfig::SIZE); $max_size = $config->get_int(UploadConfig::SIZE);
$max_kb = to_shorthand_int($max_size); $max_kb = to_shorthand_int($max_size);
$max_total_size = parse_shorthand_int(ini_get('post_max_size')) - 102400; //leave room for http request data $max_total_size = parse_shorthand_int(ini_get('post_max_size'));
$max_total_kb = to_shorthand_int($max_total_size); $max_total_kb = to_shorthand_int($max_total_size);
// <input type='hidden' name='max_file_size' value='$max_size' /> // <input type='hidden' name='max_file_size' value='$max_size' />
@ -327,8 +328,13 @@ class UploadTheme extends Themelet
return DIV( return DIV(
["class" => 'mini_upload'], ["class" => 'mini_upload'],
$form, $form,
$max_size > 0 ? SMALL("(Max file size is $max_kb)") : null, SMALL(
$max_total_size > 0 ? SMALL(BR(), "(Max total size is $max_total_kb)") : null, "(",
$max_size > 0 ? "File limit $max_kb" : null,
$max_size > 0 && $max_total_size > 0 ? " / " : null,
$max_total_size > 0 ? "Total limit $max_total_kb" : null,
")",
),
NOSCRIPT(BR(), A(["href" => make_link("upload")], "Larger Form")) NOSCRIPT(BR(), A(["href" => make_link("upload")], "Larger Form"))
); );
} }