mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-05 23:55:21 +02:00
Code Issues Projects Releases Wiki Activity

MDL-24446 prevent problems with invalid values of CFG->maxbytes

Browse Source
This commit is contained in:
Petr Skoda 2010-09-29 21:50:11 +00:00
parent 9b540305df
commit e995de87e2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/moodlelib.php
View File

@ -5325,19 +5325,20 @@ function get_max_upload_sizes($sitebytes=0, $coursebytes=0, $modulebytes=0) {
return array(); return array();
} }
$filesize[$maxsize] = display_size($maxsize); $filesize[intval($maxsize)] = display_size($maxsize);
$sizelist = array(10240, 51200, 102400, 512000, 1048576, 2097152, $sizelist = array(10240, 51200, 102400, 512000, 1048576, 2097152,
5242880, 10485760, 20971520, 52428800, 104857600); 5242880, 10485760, 20971520, 52428800, 104857600);
// Allow maxbytes to be selected if it falls outside the above boundaries // Allow maxbytes to be selected if it falls outside the above boundaries
if( isset($CFG->maxbytes) && !in_array($CFG->maxbytes, $sizelist) ){ if (isset($CFG->maxbytes) && !in_array(get_real_size($CFG->maxbytes), $sizelist)) {
$sizelist[] = $CFG->maxbytes; // note: get_real_size() is used in order to prevent problems with invalid values
$sizelist[] = get_real_size($CFG->maxbytes);
} }
foreach ($sizelist as $sizebytes) { foreach ($sizelist as $sizebytes) {
if ($sizebytes < $maxsize) { if ($sizebytes < $maxsize) {
$filesize[$sizebytes] = display_size($sizebytes); $filesize[intval($sizebytes)] = display_size($sizebytes);
} }
} }
@ -5492,7 +5493,7 @@ function display_size($size) {
} else if ($size >= 1024) { } else if ($size >= 1024) {
$size = round($size / 1024 * 10) / 10 . $kb; $size = round($size / 1024 * 10) / 10 . $kb;
} else { } else {
$size = $size .' '. $b; $size = intval($size) .' '. $b; // file sizes over 2GB can not work in 32bit PHP anyway
} }
return $size; return $size;
} }