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

Merge branch 'MDL-34107_filename_dot' of git://github.com/davosmith/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2012-07-10 11:47:20 +12:00
parent 0f36bce51e 970f0c0a36
commit 3b37c5ceb9
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repository/upload/lib.php
+14 -9
View File
@@ -155,17 +155,22 @@ class repository_upload extends repository {
$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 . ')$#i', $saveas_filename)) {
// saveas filename contains file extension already
if (strpos($filename, '.') === false) {
// File has no extension at all - do not add a dot.
$record->filename = $saveas_filename;
} else {
$record->filename = $saveas_filename . '.' . $ext;
if (preg_match('/\.([a-z0-9]+)$/i', $filename, $match)) {
if (isset($match[1])) {
$ext = $match[1];
}
}
$ext = !empty($ext) ? $ext : '';
if (preg_match('#\.(' . $ext . ')$#i', $saveas_filename)) {
// saveas filename contains file extension already
$record->filename = $saveas_filename;
} else {
$record->filename = $saveas_filename . '.' . $ext;
}
}
}