mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

"MDL-13766, fixed download dir"

Browse Source
This commit is contained in:
Dongsheng Cai 2010-05-04 06:59:03 +00:00
parent e9fe9a92c3
commit b6accf69a0
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/files_ajax.php
View File

@ -154,8 +154,8 @@ case 'zip':
case 'downloaddir':
$zipper = new zip_packer();
$fs = get_file_storage();
$draftarea = file_get_draft_area_info($itemid);
if ($draftarea['filecount'] == 0) {
$area = file_get_user_area_info($itemid, $filearea);
if ($area['filecount'] == 0) {
echo json_encode(false);
die;
}
@ -171,9 +171,9 @@ case 'downloaddir':
// archive compressed file to an unused draft area
$newdraftitemid = file_get_unused_draft_itemid();
if ($newfile = $zipper->archive_to_storage(array($stored_file), $user_context->id, $filearea, $newdraftitemid, '/', $filename, $USER->id)) {
if ($newfile = $zipper->archive_to_storage(array($stored_file), $user_context->id, 'user_draft', $newdraftitemid, '/', $filename, $USER->id)) {
$return = new stdclass;
$return->fileurl = $CFG->wwwroot . '/draftfile.php/' . $user_context->id .'/'.$filearea.'/'.$newdraftitemid.'/'.$filename;
$return->fileurl = $CFG->wwwroot . '/draftfile.php/' . $user_context->id .'/user_draft/'.$newdraftitemid.'/'.$filename;
$return->filepath = $parent_path;
echo json_encode($return);
} else {

15
lib/filelib.php
View File

@ -484,6 +484,21 @@ function file_get_draft_area_info($draftitemid) {
return $results;
}
function file_get_user_area_info($draftitemid, $filearea = 'user_draft') {
global $CFG, $USER;
$usercontext = get_context_instance(CONTEXT_USER, $USER->id);
$fs = get_file_storage();
$results = array();
// The number of files
$draftfiles = $fs->get_area_files($usercontext->id, $filearea, $draftitemid, 'id', false);
$results['filecount'] = count($draftfiles);
return $results;
}
/**
* Convert any string to a valid filepath