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

MDL-11586 rewritten file name collision handling in upload manager - files without extension, fixed increments if file name contains _123 already

Browse Source
This commit is contained in:
skodak
2008-02-19 13:03:01 +00:00
parent d685fe5705
commit 281ec00e8f
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/uploadlib.php
+29 -20
View File
@@ -298,28 +298,37 @@ class upload_manager {
* Handles filename collisions - if the desired filename exists it will rename it according to the pattern in $format
* @param string $destination Destination directory (to check existing files against)
* @param object $file Passed in by reference. The current file from $files we're processing.
* @param string $format The printf style format to rename the file to (defaults to filename_number.extn)
* @return string The new filename.
* @todo verify return type - this function does not appear to return anything since $file is passed in by reference
* @return void - modifies &$file parameter.
*/
function handle_filename_collision($destination, &$file, $format='%s_%d.%s') {
$part1 = explode('.', $file['name']);
$bits = array();
$bits[1] = array_pop($part1);
$bits[0] = implode('.', $part1);
// check for collisions and append a nice numberydoo.
if (file_exists($destination .'/'. $file['name'])) {
$a->oldname = $file['name'];
for ($i = 1; true; $i++) {
$try = sprintf($format, $bits[0], $i, $bits[1]);
if ($this->check_before_renaming($destination, $try, $file)) {
$file['name'] = $try;
break;
}
}
$a->newname = $file['name'];
$file['uploadlog'] .= "\n". get_string('uploadrenamedcollision','moodle', $a);
function handle_filename_collision($destination, &$file) {
if (!file_exists($destination .'/'. $file['name'])) {
return;
}
$parts = explode('.', $file['name']);
if (count($parts) > 1) {
$extension = '.'.array_pop($parts);
$name = implode('.', $parts);
} else {
$extension = '';
$name = $file['name'];
}
$current = 0;
if (preg_match('/^(.*)_(\d*)$/s', $name, $matches)) {
$name = $matches[1];
$current = (int)$matches[2];
}
$i = $current + 1;
while (!$this->check_before_renaming($destination, $name.'_'.$i.$extension, $file)) {
$i++;
}
$a = new object();
$a->oldname = $file['name'];
$file['name'] = $name.'_'.$i.$extension;
$a->newname = $file['name'];
$file['uploadlog'] .= "\n". get_string('uploadrenamedcollision','moodle', $a);
}
/**