[BUGFIX] jirafeau_ini_to_bytes with no modifier

When setting a PHP ini value like `post_max_size`,
the value may not have a modifier (e.g. "M") and
for "0" input, the function return empty string.

Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>

diff --git a/lib/functions.php b/lib/functions.php
index cfc7dce8250f58c1debeec5e23477d97dca71c74..1e084fbe33d9064f7153fc366af43a66831910d8 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -190,6 +190,9 @@ function jirafeau_ini_to_bytes($value)
     $modifier = substr($value, -1);
     $bytes = substr($value, 0, -1);
     switch (strtoupper($modifier)) {
     $modifier = substr($value, -1);
     $bytes = substr($value, 0, -1);
     switch (strtoupper($modifier)) {

+    default:
+        return intval($value);
+        break;

     case 'P':
         $bytes *= 1024;
         // no break
     case 'P':
         $bytes *= 1024;
         // no break


@@ -243,7 +246,6 @@ function jirafeau_get_max_upload_chunk_size_bytes($max_upload_chunk_size_bytes =
         }
         return $size;
     }
         }
         return $size;
     }

-

     $size = min(
         jirafeau_get_max_upload_size_bytes(),
         $max_upload_chunk_size_bytes
     $size = min(
         jirafeau_get_max_upload_size_bytes(),
         $max_upload_chunk_size_bytes