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

MDL-23984 removing unnecessary temp dir when exporting all online assignments, fixing missing text_format

Browse Source
This commit is contained in:
Petr Skoda
2010-08-29 16:54:03 +00:00
parent 59333bc943
commit c0c757120d
2 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assignment/lib.php
-22
View File
@@ -3622,29 +3622,7 @@ function assignment_pack_files($filesforzipping) {
}
return false;
}
//TODO - this is a copy of the function my_mktempdir in admin/uploadpicture.php - it would be good to have as a core function.
/**
* Create a unique temporary directory with a given prefix name,
* inside a given directory, with given permissions. Return the
* full path to the newly created temp directory.
*
* @param string $dir where to create the temp directory.
* @param string $prefix prefix for the temp directory name (default '')
* @param string $mode permissions for the temp directory (default 700)
*
* @return string The full path to the temp directory.
*/
function assignment_create_temp_dir($dir, $prefix='', $mode=0700) {
if (substr($dir, -1) != '/') {
$dir .= '/';
}
do {
$path = $dir.$prefix.mt_rand(0, 9999999);
} while (!mkdir($path, $mode));
return $path;
}
/**
* Lists all file areas current user may browse
*
mod/assignment/type/online/assignment.class.php
+8 -8
View File
@@ -382,14 +382,17 @@ class assignment_online extends assignment_base {
*/
public function download_submissions() {
global $CFG, $DB;
require_once($CFG->libdir.'/filelib.php');
@raise_memory_limit('256M');
$submissions = $this->get_submissions('','');
if (empty($submissions)) {
error("there are no submissions to download");
}
$filesforzipping = array();
$tempdir = assignment_create_temp_dir($CFG->dataroot."/temp/", "assignment".$this->assignment->id); //location for temp files.
//NOTE: do not create any stuff in temp directories, we now support unicode file names and that would not work, sorry
//online assignment can use html
$filextn=".html";
@@ -407,17 +410,14 @@ class assignment_online extends assignment_base {
if ((groups_is_member($groupid,$a_userid)or !$groupmode or !$groupid)) {
$a_assignid = $submission->assignment; //get name of this assignment for use in the file names.
$a_user = $DB->get_record("user", array("id"=>$a_userid),'id,username,firstname,lastname'); //get user firstname/lastname
$submissioncontent = "<html><body>". $submission->data1. "</body></html>"; //fetched from database
$submissioncontent = "<html><body>". format_text($submission->data1, $submission->data2). "</body></html>"; //fetched from database
//get file name.html
$fileforzipname = $a_user->username . "_" . clean_filename($this->assignment->name) . $filextn;
$fd = fopen($tempdir . $fileforzipname,'wb'); //create if not exist, write binary
fwrite( $fd, $submissioncontent);
fclose( $fd );
$filesforzipping[$fileforzipname] = $tempdir.$fileforzipname;
$filesforzipping[$fileforzipname] = array($submissioncontent);
}
} //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.
}
}