diff options
author | Robin Appelman <icewind1991@gmail.com> | 2011-12-11 23:33:24 +0100 |
---|---|---|
committer | Robin Appelman <icewind1991@gmail.com> | 2011-12-11 23:34:27 +0100 |
commit | 5e711f37ca3f009317a3c8cd0e47ed4f15922142 (patch) | |
tree | b4303df624fc889039ea452f9c9670905fdf12dc /lib/helper.php | |
parent | 9c6d3a83fd0541ec95f13cef40f1030455391b13 (diff) | |
download | nextcloud-server-5e711f37ca3f009317a3c8cd0e47ed4f15922142.tar.gz nextcloud-server-5e711f37ca3f009317a3c8cd0e47ed4f15922142.zip |
make filesize parsing case insensitive
Diffstat (limited to 'lib/helper.php')
-rw-r--r-- | lib/helper.php | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/helper.php b/lib/helper.php index 5b3e394cafd..24d436225b7 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -160,24 +160,25 @@ class OC_Helper { */ public static function computerFileSize( $str ){ $bytes = 0; + $str=strtolower($str); $bytes_array = array( - 'B' => 1, - 'K' => 1024, - 'KB' => 1024, - 'MB' => 1024 * 1024, - 'M' => 1024 * 1024, - 'GB' => 1024 * 1024 * 1024, - 'G' => 1024 * 1024 * 1024, - 'TB' => 1024 * 1024 * 1024 * 1024, - 'T' => 1024 * 1024 * 1024 * 1024, - 'PB' => 1024 * 1024 * 1024 * 1024 * 1024, - 'P' => 1024 * 1024 * 1024 * 1024 * 1024, + 'b' => 1, + 'k' => 1024, + 'kb' => 1024, + 'mb' => 1024 * 1024, + 'm' => 1024 * 1024, + 'gb' => 1024 * 1024 * 1024, + 'g' => 1024 * 1024 * 1024, + 'tb' => 1024 * 1024 * 1024 * 1024, + 't' => 1024 * 1024 * 1024 * 1024, + 'pb' => 1024 * 1024 * 1024 * 1024 * 1024, + 'p' => 1024 * 1024 * 1024 * 1024 * 1024, ); $bytes = floatval($str); - if (preg_match('#([KMGTP]?B?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) { + if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) { $bytes *= $bytes_array[$matches[1]]; } |