diff options
| author | Simon Rettberg | 2019-02-12 14:55:49 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-12 14:55:49 +0100 |
| commit | ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9 (patch) | |
| tree | 0134ad4e33aa259250fb46a82e7da44b091db88e /inc/util.inc.php | |
| parent | [serversetup*] PXELinux and iPXE side-by-side (diff) | |
| parent | [inc/Dictionary] Teh evil unvalidated redirects must die! (diff) | |
| download | slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.tar.gz slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.tar.xz slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.zip | |
Merge branch 'master' into ipxeipxe
Diffstat (limited to 'inc/util.inc.php')
| -rw-r--r-- | inc/util.inc.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/util.inc.php b/inc/util.inc.php index 1a5cbefe..e459cc46 100644 --- a/inc/util.inc.php +++ b/inc/util.inc.php @@ -234,9 +234,10 @@ SADFACE; * * @param float|int $bytes numeric value of the filesize to make readable * @param int $decimals number of decimals to show, -1 for automatic + * @param int $shift how many units to skip, i.e. if you pass in KiB or MiB * @return string human readable string representing the given file size */ - public static function readableFileSize($bytes, $decimals = -1) + public static function readableFileSize($bytes, $decimals = -1, $shift = 0) { $bytes = round($bytes); static $sz = array('Byte', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB'); @@ -249,7 +250,7 @@ SADFACE; $decimals = 2 - floor(strlen((int)$bytes) - 1); } } - return sprintf("%.{$decimals}f", $bytes) . "\xe2\x80\x89" . $sz[$factor]; + return sprintf("%.{$decimals}f", $bytes) . "\xe2\x80\x89" . $sz[$factor + $shift]; } public static function sanitizeFilename($name) |