mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Separate PHP upload limit and free space

This commit is contained in:
Pellaeon Lin 2013-12-08 22:59:46 +08:00
parent 69f2bde324
commit fc607e6bce
2 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/private/helper.php
View File

@ -828,23 +828,39 @@ class OC_Helper {
* @return number of bytes representing * @return number of bytes representing
*/ */
public static function maxUploadFilesize($dir) { public static function maxUploadFilesize($dir) {
$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); return min(self::freeSpace($dir), self::uploadLimit());
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); }
$freeSpace = \OC\Files\Filesystem::free_space($dir);
if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) {
$maxUploadFilesize = \OC\Files\SPACE_UNLIMITED;
} elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) {
$maxUploadFilesize = max($upload_max_filesize, $post_max_size); //only the non 0 value counts
} else {
$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
}
/**
* Calculate free space left within user quota
*
* @param $dir the current folder where the user currently operates
* @return number of bytes representing
*/
public static function freeSpace($dir) {
$freeSpace = \OC\Files\Filesystem::free_space($dir);
if ($freeSpace !== \OC\Files\SPACE_UNKNOWN) { if ($freeSpace !== \OC\Files\SPACE_UNKNOWN) {
$freeSpace = max($freeSpace, 0); $freeSpace = max($freeSpace, 0);
return $freeSpace;
return min($maxUploadFilesize, $freeSpace);
} else { } else {
return $maxUploadFilesize; return INF;
}
}
/**
* Calculate PHP upload limit
*
* @return PHP upload file size limit
*/
public static function uploadLimit() {
$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) {
return INF;
} elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) {
return max($upload_max_filesize, $post_max_size); //only the non 0 value counts
} else {
return min($upload_max_filesize, $post_max_size);
} }
} }

19
lib/public/util.php
View File

@ -458,4 +458,23 @@ class Util {
public static function maxUploadFilesize($dir) { public static function maxUploadFilesize($dir) {
return \OC_Helper::maxUploadFilesize($dir); return \OC_Helper::maxUploadFilesize($dir);
} }
/**
* Calculate free space left within user quota
*
* @param $dir the current folder where the user currently operates
* @return number of bytes representing
*/
public static function freeSpace($dir) {
return \OC_Helper::freeSpace($dir);
}
/**
* Calculate PHP upload limit
*
* @return number of bytes representing
*/
public static function uploadLimit() {
return \OC_Helper::uploadLimit();
}
} }