diff options
| author | Florian Pritz <bluewind@xinu.at> | 2015-09-14 13:44:47 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-09-14 18:51:42 +0200 |
| commit | 441f9ceb06c5cbdb9fc258114d2aadb9e71d280a (patch) | |
| tree | 2d805bdd9ffea6cf85fe4b6bacd9a2a77383411e /application | |
| parent | 4dd606db850448c45977ddf5e65a9e0b625a30d4 (diff) | |
API 1.4: Add more values to file/get_config
These are necessary for clients that want to send lots of fields e.g.
in a delete request or upload multiple files in one upload request.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application')
| -rw-r--r-- | application/controllers/api/v1/api_info.php | 2 | ||||
| -rw-r--r-- | application/controllers/api/v1/file.php | 3 | ||||
| -rw-r--r-- | application/helpers/filebin_helper.php | 12 |
3 files changed, 15 insertions, 2 deletions
diff --git a/application/controllers/api/v1/api_info.php b/application/controllers/api/v1/api_info.php index abc4fd51e..cd94869f8 100644 --- a/application/controllers/api/v1/api_info.php +++ b/application/controllers/api/v1/api_info.php @@ -11,6 +11,6 @@ namespace controllers\api\v1; class api_info extends \controllers\api\api_controller { static public function get_version() { - return "1.3.0"; + return "1.4.0"; } } diff --git a/application/controllers/api/v1/file.php b/application/controllers/api/v1/file.php index ccc83f404..4ffc8ed48 100644 --- a/application/controllers/api/v1/file.php +++ b/application/controllers/api/v1/file.php @@ -47,10 +47,11 @@ class file extends \controllers\api\api_controller { public function get_config() { - // TODO: return more fields? return array( "upload_max_size" => $this->config->item("upload_max_size"), "max_files_per_request" => intval(ini_get("max_file_uploads")), + "max_input_vars" => intval(ini_get("max_input_vars")), + "request_max_size" => return_bytes(ini_get("post_max_size")), ); } diff --git a/application/helpers/filebin_helper.php b/application/helpers/filebin_helper.php index c1f302da3..5e37f4b80 100644 --- a/application/helpers/filebin_helper.php +++ b/application/helpers/filebin_helper.php @@ -369,4 +369,16 @@ function files_are_equal($a, $b) return $result; } +# Source: http://php.net/manual/en/function.ini-get.php#96996 +function return_bytes($size_str) +{ + switch (substr ($size_str, -1)) + { + case 'K': case 'k': return (int)$size_str * 1024; + case 'M': case 'm': return (int)$size_str * 1048576; + case 'G': case 'g': return (int)$size_str * 1073741824; + default: return $size_str; + } +} + # vim: set noet: |