Commit 0d312b3c authored by Jérôme Jutteau's avatar Jérôme Jutteau

[TASK] Refactor server send limitation functions

Signed-off-by: Jérôme Jutteau's avatarJerome Jutteau <mojo@couak.net>
parent 108eff38
......@@ -204,7 +204,7 @@ function jirafeau_ini_to_bytes($value)
function jirafeau_get_max_upload_size_bytes()
{
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()
{
return jirafeau_human_size(
min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))));
return jirafeau_human_size(jirafeau_get_max_upload_size_bytes());
}
/**
......
......@@ -203,8 +203,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
}
exit;
} elseif (isset($_GET['get_capacity'])) {
echo min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
echo jirafeau_get_max_upload_size_bytes();
} elseif (isset($_GET['get_maximal_upload_size'])) {
echo $cfg['maximal_upload_size'];
} elseif (isset($_GET['get_version'])) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment