diff options
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/legacy/OC_Helper.php | 25 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Util.php | 4 |
2 files changed, 14 insertions, 15 deletions
diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php index 7d0837402fa..5301fe5a498 100644 --- a/lib/private/legacy/OC_Helper.php +++ b/lib/private/legacy/OC_Helper.php @@ -49,6 +49,7 @@ use OCP\Files\Mount\IMountPoint; use OCP\ICacheFactory; use OCP\IBinaryFinder; use OCP\IUser; +use OCP\Util; use Psr\Log\LoggerInterface; /** @@ -59,12 +60,12 @@ class OC_Helper { /** * Make a human file size - * @param int $bytes file size in bytes + * @param int|float $bytes file size in bytes * @return string a human readable file size * * Makes 2048 to 2 kB. */ - public static function humanFileSize($bytes) { + public static function humanFileSize(int|float $bytes): string { if ($bytes < 0) { return "?"; } @@ -126,9 +127,7 @@ class OC_Helper { return false; } - $bytes = round($bytes); - - return $bytes; + return Util::numericToNumber(round($bytes)); } /** @@ -384,8 +383,8 @@ class OC_Helper { * calculates the maximum upload size respecting system settings, free space and user quota * * @param string $dir the current folder where the user currently operates - * @param int $freeSpace the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly - * @return int number of bytes representing + * @param int|float $freeSpace the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly + * @return int|float number of bytes representing */ public static function maxUploadFilesize($dir, $freeSpace = null) { if (is_null($freeSpace) || $freeSpace < 0) { @@ -398,7 +397,7 @@ class OC_Helper { * Calculate free space left within user quota * * @param string $dir the current folder where the user currently operates - * @return int number of bytes representing + * @return int|float number of bytes representing */ public static function freeSpace($dir) { $freeSpace = \OC\Files\Filesystem::free_space($dir); @@ -413,12 +412,12 @@ class OC_Helper { /** * Calculate PHP upload limit * - * @return int PHP upload file size limit + * @return int|float PHP upload file size limit */ public static function uploadLimit() { $ini = \OC::$server->get(IniGetWrapper::class); - $upload_max_filesize = (int)OCP\Util::computerFileSize($ini->get('upload_max_filesize')); - $post_max_size = (int)OCP\Util::computerFileSize($ini->get('post_max_size')); + $upload_max_filesize = Util::computerFileSize($ini->get('upload_max_filesize')) ?: 0; + $post_max_size = Util::computerFileSize($ini->get('post_max_size')) ?: 0; if ($upload_max_filesize === 0 && $post_max_size === 0) { return INF; } elseif ($upload_max_filesize === 0 || $post_max_size === 0) { @@ -579,8 +578,8 @@ class OC_Helper { /** * Get storage info including all mount points and quota */ - private static function getGlobalStorageInfo(int $quota, IUser $user, IMountPoint $mount): array { - $rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext'); + private static function getGlobalStorageInfo(int|float $quota, IUser $user, IMountPoint $mount): array { + $rootInfo = \OC\Files\Filesystem::getFileInfo('', true); $used = $rootInfo['size']; if ($used < 0) { $used = 0; diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 6dc08341b18..7f06900feb0 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -146,7 +146,7 @@ class OC_Util { /** * check if share API enforces a default expire date * - * @return boolean + * @return bool * @suppress PhanDeprecatedFunction */ public static function isDefaultExpireDateEnforced() { @@ -159,7 +159,7 @@ class OC_Util { * Get the quota of a user * * @param IUser|null $user - * @return int|\OCP\Files\FileInfo::SPACE_UNLIMITED|false Quota bytes + * @return int|\OCP\Files\FileInfo::SPACE_UNLIMITED|false|float Quota bytes */ public static function getUserQuota(?IUser $user) { if (is_null($user)) { |