--- moodle_cvs/mod/assignment/lib.php 2008-07-16 07:16:59.000000000 -0400
+++ /var/www/moodle19/mod/assignment/lib.php 2008-07-15 08:40:59.000000000 -0400
@@ -1337,13 +1337,6 @@
echo '';
}
/// End of fast grading form
- // print button offering zip file function to teacher
- $options["id"] = "$cm->id";
- $options["download"] = "zip";
- echo '';
- print_single_button("submissions.php",$options, "Zip & Download all submissions");
- echo '
';
-
/// Mini form for setting user preference
echo '';
--- moodle_cvs/mod/assignment/submissions.php 2008-07-16 07:06:57.000000000 -0400
+++ /var/www/moodle19/mod/assignment/submissions.php 2008-07-15 08:40:59.000000000 -0400
@@ -6,7 +6,6 @@
$id = optional_param('id', 0, PARAM_INT); // Course module ID
$a = optional_param('a', 0, PARAM_INT); // Assignment ID
$mode = optional_param('mode', 'all', PARAM_ALPHA); // What mode are we in?
- $download = optional_param('download' , 'none', PARAM_ALPHA); //ZIP download asked for?
if ($id) {
if (! $cm = get_coursemodule_from_id('assignment', $id)) {
@@ -41,10 +40,6 @@
$assignmentclass = 'assignment_'.$assignment->assignmenttype;
$assignmentinstance = new $assignmentclass($cm->id, $assignment, $cm, $course);
-if($download == "zip") {
- $assignmentinstance->download_submissions();
- } else {
-
$assignmentinstance->submissions($mode); // Display or process the submissions
- }
+
?>
--- moodle_cvs/mod/assignment/type/online/assignment.class.php 2008-07-16 07:32:56.000000000 -0400
+++ /var/www/moodle19/mod/assignment/type/online/assignment.class.php 2008-07-15 08:40:59.000000000 -0400
@@ -260,73 +260,6 @@
}
- function download_submissions() {
- global $CFG;
- $submit = $this->get_submissions('','');
-
- $filesforzipping = array();
- $filesnewname = array();
- $desttemp = "";
-
- //create zip filename
- $filename = "online_assignment.zip";
-
- //online assignment can use html
- $file=".html";
-
-
- foreach ($submit as $tp) {
- $a_userid = $tp->userid; //get userid
- $a_assignid = $tp->assignment; //get name of this assignment for use in the file names.
-
- $a_user = get_complete_user_data("id", $a_userid); //get user
-
- $filearea = $this->file_area_name($a_userid);
-
- $submission = $tp->data1; //fetched from mysql database
-
- $desttemp = $CFG->dataroot . "/" . substr($filearea, 0, strripos($filearea, "/")). "/temp/";
- //get temp directory name
-
- if (!file_exists($desttemp)) { //create temp dir if it doesn't already exist.
- mkdir($desttemp);
- }
-
- require_once($CFG->libdir.'/filelib.php');
-
- //get file name.html
- $filesforzip = $desttemp . $a_user->firstname ."_". $a_user->lastname . $file;
-
-
- $fd = fopen($filesforzip,'wb'); //create if not exist, write binary
- fwrite( $fd, $submission);
- fclose( $fd );
-
- //save file name to array for zipping.
- $filesforzipping[] = $filesforzip;
- } //end of foreach
-
- //zip files
-
-
-
- zip_files($filesforzipping, $desttemp.$filename);
-
- //delete old temp files
- foreach ($filesforzipping as $filefor) {
- unlink($filefor);
- }
-
- //send file to user.
- if (file_exists($desttemp.$filename)) {
- header ("Cache-Control: must-revalidate, post-check=0, pre-check=0");
- header ("Content-Type: application/octet-stream");
- header ("Content-Length: " . filesize($desttemp.$filename));
- header ("Content-Disposition: attachment; filename=$filename");
- readfile($desttemp.$filename);
- }
- }
-
}
class mod_assignment_online_edit_form extends moodleform {
--- moodle_cvs/mod/assignment/type/upload/assignment.class.php 2008-07-16 07:33:26.000000000 -0400
+++ /var/www/moodle19/mod/assignment/type/upload/assignment.class.php 2008-07-15 08:40:59.000000000 -0400
@@ -1054,73 +1054,6 @@
}
- function download_submissions() {
- global $CFG;
-
- $submissions = $this->get_submissions('','');
-
- $filesforzipping = array();
- $filesnewname = array();
- $desttemp = "";
-
- //create prefix of new filename
- $filenewname = $this->assignment->name. "_";
-
- foreach ($submissions as $submission) {
- $a_userid = $submission->userid; //get userid
- $a_assignid = $submission->assignment; //get name of this assignment for use in the file names.
-
- $a_user = get_complete_user_data("id", $a_userid); //get user
-
- $filearea = $this->file_area_name($a_userid);
-
- $desttemp = $CFG->dataroot . "/" . substr($filearea, 0, strrpos($filearea, "/")). "/temp/"; //get temp directory name
-
- if (!file_exists($desttemp)) { //create temp dir if it doesn't already exist.
- mkdir($desttemp);
- }
-
- if ($basedir = $this->file_area($a_userid)) {
- if ($files = get_directory_list($basedir)) {
- foreach ($files as $key => $file) {
- require_once($CFG->libdir.'/filelib.php');
-
- //get files new name.
- $filesforzip = $desttemp . $a_user->username . "_" . $filenewname . "_" . $file;
-
- //get files old name
- $fileold = $CFG->dataroot . "/" . $filearea . "/" . $file;
-
- if (!copy($fileold, $filesforzip)) {
- error ("failed to copy file
" . $filesforzip . "
" .$fileold);
- }
-
- //save file name to array for zipping.
- $filesforzipping[] = $filesforzip;
- }
- }
- }
- }
-
- //zip files
- $filename = "assignment.zip"; //name of new zip file.
- zip_files($filesforzipping, $desttemp.$filename);
-
- //delete old temp files
- foreach ($filesforzipping as $filefor) {
- unlink($filefor);
- }
-
- //send file to user.
- if (file_exists($desttemp.$filename)) {
- header ("Cache-Control: must-revalidate, post-check=0, pre-check=0");
- header ("Content-Type: application/octet-stream");
- header ("Content-Length: " . filesize($desttemp.$filename));
- header ("Content-Disposition: attachment; filename=$filename");
- readfile($desttemp.$filename);
- }
- }
-
}
class mod_assignment_upload_notes_form extends moodleform {
--- moodle_cvs/mod/assignment/type/uploadsingle/assignment.class.php 2008-07-16 07:33:44.000000000 -0400
+++ /var/www/moodle19/mod/assignment/type/uploadsingle/assignment.class.php 2008-07-15 08:40:59.000000000 -0400
@@ -180,73 +180,6 @@
}
- function download_submissions() {
- global $CFG;
-
- $submissions = $this->get_submissions('','');
-
- $filesforzipping = array();
- $filesnewname = array();
- $desttemp = "";
-
- //create prefix of new filename
- $filenewname = $this->assignment->name. "_";
-
- foreach ($submissions as $submission) {
- $a_userid = $submission->userid; //get userid
- $a_assignid = $submission->assignment; //get name of this assignment for use in the file names.
-
- $a_user = get_complete_user_data("id", $a_userid); //get user
-
- $filearea = $this->file_area_name($a_userid);
-
- $desttemp = $CFG->dataroot . "/" . substr($filearea, 0, strrpos($filearea, "/")). "/temp/"; //get temp directory name
-
- if (!file_exists($desttemp)) { //create temp dir if it doesn't already exist.
- mkdir($desttemp);
- }
-
- if ($basedir = $this->file_area($a_userid)) {
- if ($files = get_directory_list($basedir)) {
- foreach ($files as $key => $file) {
- require_once($CFG->libdir.'/filelib.php');
-
- //get files new name.
- $filesforzip = $desttemp . $a_user->username . "_" . $filenewname . "_" . $file;
-
- //get files old name
- $fileold = $CFG->dataroot . "/" . $filearea . "/" . $file;
-
- if (!copy($fileold, $filesforzip)) {
- error ("failed to copy file
" . $filesforzip . "
" .$fileold);
- }
-
- //save file name to array for zipping.
- $filesforzipping[] = $filesforzip;
- }
- }
- }
- }
-
- //zip files
- $filename = "assignment.zip"; //name of new zip file.
- zip_files($filesforzipping, $desttemp.$filename);
-
- //delete old temp files
- foreach ($filesforzipping as $filefor) {
- unlink($filefor);
- }
-
- //send file to user.
- if (file_exists($desttemp.$filename)) {
- header ("Cache-Control: must-revalidate, post-check=0, pre-check=0");
- header ("Content-Type: application/octet-stream");
- header ("Content-Length: " . filesize($desttemp.$filename));
- header ("Content-Disposition: attachment; filename=$filename");
- readfile($desttemp.$filename);
- }
- }
-
}
?>