From 6db1124204f96c99e26abd1dfd7d4db14561cfef Mon Sep 17 00:00:00 2001
From: Dan Marsden <Dan@digitalclay.co.nz>
Date: Sun, 25 Apr 2010 07:20:17 +0000
Subject: [PATCH] Assignment MDL-7206 - zip_packer allows passing of file
 objects - doesn't need real path

---
 mod/assignment/type/upload/assignment.class.php       | 8 +-------
 mod/assignment/type/uploadsingle/assignment.class.php | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index d8fe8eff985..704521662ca 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -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.
         }
     }
diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php
index 1193721f7cc..5b4eac8f297 100644
--- a/mod/assignment/type/uploadsingle/assignment.class.php
+++ b/mod/assignment/type/uploadsingle/assignment.class.php
@@ -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.
         }
     }