moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'm20_MDL-25215_filepicker_saveas' of git://github.com/dongsheng/moodle

Browse source
This commit is contained in:
Petr Skoda 2011-02-14 09:43:06 +01:00
commit 419814db02
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
repository/upload/lib.php
View file

@ -105,7 +105,21 @@ class repository_upload extends repository {
if (empty($saveas_filename)) { if (empty($saveas_filename)) {
$record->filename = clean_param($_FILES[$elname]['name'], PARAM_FILE); $record->filename = clean_param($_FILES[$elname]['name'], PARAM_FILE);
} else { } else {
$record->filename = $saveas_filename; $ext = '';
$match = array();
$filename = clean_param($_FILES[$elname]['name'], PARAM_FILE);
if (preg_match('/\.([a-z0-9]+)$/i', $filename, $match)) {
if (isset($match[1])) {
$ext = $match[1];
}
}
$ext = !empty($ext) ? $ext : '';
if (preg_match('#\.(' . $ext . ')$#', $saveas_filename)) {
// saveas filename contains file extension already
$record->filename = $saveas_filename;
} else {
$record->filename = $saveas_filename . '.' . $ext;
}
} }
if ($this->mimetypes != '*') { if ($this->mimetypes != '*') {