mirror_php/Jirafeau
1
0
Fork 0
mirror of https://gitlab.com/mojo42/Jirafeau.git synced 2025-05-09 12:36:43 +02:00
Code Issues Projects Releases Wiki Activity

[TASK] Refactor server send limitation functions

Browse Source 
Signed-off-by: Jerome Jutteau <mojo@couak.net>
This commit is contained in:
Jerome Jutteau 2018-05-04 09:15:06 +02:00
parent 108eff3814
commit 0d312b3c20
2 changed files with 3 additions and 6 deletions

6
lib/functions.php

@ -204,7 +204,7 @@ function jirafeau_ini_to_bytes($value)
function jirafeau_get_max_upload_size_bytes() function jirafeau_get_max_upload_size_bytes()
{ {
return min(jirafeau_ini_to_bytes(ini_get('post_max_size')), return min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))); jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
} }
/** /**
@ -213,9 +213,7 @@ function jirafeau_get_max_upload_size_bytes()
*/ */
function jirafeau_get_max_upload_size() function jirafeau_get_max_upload_size()
{ {
return jirafeau_human_size( return jirafeau_human_size(jirafeau_get_max_upload_size_bytes());
min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))));
} }
/** /**

3
script.php

@ -203,8 +203,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
} }
exit; exit;
} elseif (isset($_GET['get_capacity'])) { } elseif (isset($_GET['get_capacity'])) {
echo min(jirafeau_ini_to_bytes(ini_get('post_max_size')), echo jirafeau_get_max_upload_size_bytes();
jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
} elseif (isset($_GET['get_maximal_upload_size'])) { } elseif (isset($_GET['get_maximal_upload_size'])) {
echo $cfg['maximal_upload_size']; echo $cfg['maximal_upload_size'];
} elseif (isset($_GET['get_version'])) { } elseif (isset($_GET['get_version'])) {