mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 12:34:28 +01:00
Code Issues Projects Releases Wiki Activity

Assignment MDL-7206 - zip_packer allows passing of file objects - doesn't need real path

Browse Source
This commit is contained in:
Dan Marsden 2010-04-25 07:20:17 +00:00
parent f612434fb8
commit 6db1124204
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/assignment/type/upload/assignment.class.php
View File

@ -1133,7 +1133,6 @@ class assignment_upload extends assignment_base {
}
$filesforzipping = array();
$filenewname = clean_filename($this->assignment->name); //create prefix of individual files
$tempdir = assignment_create_temp_dir($CFG->dataroot."/temp/", "assignment".$this->assignment->id); //location for temp files.
$fs = get_file_storage();
$groupmode = groupmode($this->course,$this->cm);
@ -1155,17 +1154,12 @@ class assignment_upload extends assignment_base {
foreach ($files as $file) {
//get files new name.
$fileforzipname = $a_user->username . "_" . $filenewname . "_" . $file->get_filename();
//get files old name
if (!$file->copy_content_to($tempdir . $fileforzipname)) {
error ("failed to copy file<br>" .$tempdir. $fileforzipname);
}
//save file name to array for zipping.
$filesforzipping[$fileforzipname] = $tempdir.$fileforzipname;
$filesforzipping[$fileforzipname] = $file;
}
}
} // end of foreach loop
if ($zipfile = assignment_pack_files($filesforzipping)) {
remove_dir($tempdir); //remove old tempdir with individual files.
send_temp_file($zipfile, $filename); //send file and delete after sending.
}
}

8
mod/assignment/type/uploadsingle/assignment.class.php
View File

@ -243,7 +243,6 @@ class assignment_uploadsingle extends assignment_base {
}
$filesforzipping = array();
$filenewname = clean_filename($this->assignment->name); //create prefix of individual files
$tempdir = assignment_create_temp_dir($CFG->dataroot."/temp/", "assignment".$this->assignment->id); //location for temp files.
$fs = get_file_storage();
$groupmode = groupmode($this->course,$this->cm);
@ -265,17 +264,12 @@ class assignment_uploadsingle extends assignment_base {
foreach ($files as $file) {
//get files new name.
$fileforzipname = $a_user->username . "_" . $filenewname . "_" . $file->get_filename();
//get files old name
if (!$file->copy_content_to($tempdir . $fileforzipname)) {
error ("failed to copy file<br>" .$tempdir. $fileforzipname);
}
//save file name to array for zipping.
$filesforzipping[$fileforzipname] = $tempdir.$fileforzipname;
$filesforzipping[$fileforzipname] = $file;
}
}
} // End of foreach
if ($zipfile = assignment_pack_files($filesforzipping)) {
remove_dir($tempdir); //remove old tempdir with individual files.
send_temp_file($zipfile, $filename); //send file and delete after sending.
}
}