From 0d312b3c20fc8d17a4808442c49b72a499d0dc76 Mon Sep 17 00:00:00 2001 From: Jerome Jutteau Date: Fri, 4 May 2018 09:15:06 +0200 Subject: [PATCH 1/1] [TASK] Refactor server send limitation functions Signed-off-by: Jerome Jutteau --- lib/functions.php | 6 ++---- script.php | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/functions.php b/lib/functions.php index 8af3801..01d0638 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -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()); } /** diff --git a/script.php b/script.php index 20eafbf..aa04a6f 100644 --- a/script.php +++ b/script.php @@ -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'])) { -- 2.34.1