L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-33158 fixed bugs with restricting file typs in filepicker

Browse Source 
- extension was returned without leading dot which resulted in improper validation
- fixed human-readable mime type in error message
- fixed youtube repository to support video files and pass filetype validation
This commit is contained in:
Marina Glancy
2012-05-22 14:24:11 +08:00
parent ca9875db1b
commit e563582760
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filelib.php
+6 -6
View File
@@ -1595,22 +1595,22 @@ function mimeinfo_from_type($element, $mimetype) {
foreach($mimeinfo as $filetype => $values) {
if ($values['type'] == $mimetype) {
if ($cached[$mimetype] === null) {
$cached[$mimetype] = $filetype;
$cached[$mimetype] = '.'.$filetype;
}
if (!empty($values['defaulticon'])) {
$cached[$mimetype] = $filetype;
$cached[$mimetype] = '.'.$filetype;
break;
}
}
}
if (empty($cached[$mimetype])) {
$cached[$mimetype] = 'xxx';
$cached[$mimetype] = '.xxx';
}
}
if ($element === 'extension') {
return $cached[$mimetype];
} else {
return mimeinfo($element, '.'.$cached[$mimetype]);
return mimeinfo($element, $cached[$mimetype]);
}
}
@@ -1831,7 +1831,7 @@ function file_get_typegroup($element, $groups) {
$mimeinfo = & get_mimetypes_array();
$cached[$element][$group] = array();
foreach ($mimeinfo as $extension => $value) {
$value['extension'] = $extension;
$value['extension'] = '.'.$extension;
if (empty($value[$element])) {
continue;
}
@@ -1859,7 +1859,7 @@ function file_get_typegroup($element, $groups) {
*/
function file_extension_in_typegroup($filename, $groups, $checktype = false) {
$extension = pathinfo($filename, PATHINFO_EXTENSION);
if (!empty($extension) && in_array(strtolower($extension), file_get_typegroup('extension', $groups))) {
if (!empty($extension) && in_array('.'.strtolower($extension), file_get_typegroup('extension', $groups))) {
return true;
}
return $checktype && file_mimetype_in_typegroup(mimeinfo('type', $filename), $groups);