--- loncom/interface/multidownload.pl	2007/04/26 18:00:41	1.8
+++ loncom/interface/multidownload.pl	2007/04/26 18:30:38	1.9
@@ -2,7 +2,7 @@
 # CGI-script to allow download of all essay submissions of 
 # multiple students.
 #
-# $Id: multidownload.pl,v 1.8 2007/04/26 18:00:41 banghart Exp $
+# $Id: multidownload.pl,v 1.9 2007/04/26 18:30:38 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,21 +80,22 @@ if (&Apache::lonnet::allowed('vgr',$scop
     my $uname = $env{'user.name'};
     my $udom = $env{'user.domain'};
     mkdir($doc_zip_root."/zipdir",0700);
-    mkdir($doc_zip_root."/zipdir/$unique_path",0700);
+    mkdir($doc_zip_root."/zipdir/$uname$udom",0700);
+    mkdir($doc_zip_root."/zipdir/$uname$udom/$unique_path",0700);
     foreach my $stu (@stuchecked) {
         my ($stuname,$studom,$fullname) = split(/:/,$stu);
-        mkdir($doc_zip_root."/zipdir/$unique_path/$stuname",0700);
+        mkdir($doc_zip_root."/zipdir/$uname$udom/$unique_path/$stuname",0700);
         my %record = &Apache::lonnet::restore($symb,$courseid,$studom,$stuname);
         foreach my $part (@part_response_id) {
             my ($partid,$respid) = @{$part};
-            mkdir($doc_zip_root."/zipdir/$unique_path/$stuname/part$partid",0700);
-            mkdir($doc_zip_root."/zipdir/$unique_path/$stuname/part$partid/resp$respid",0700);
+            mkdir($doc_zip_root."/zipdir/$uname$udom/$unique_path/$stuname/part$partid",0700);
+            mkdir($doc_zip_root."/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid",0700);
             my $files = &Apache::grades::get_submitted_files($studom,$stuname,$partid,$respid,\%record);
             foreach my $file (@$files) {
                 $file =~ /(^.*\/)(.+$)/;
                 my $file_name_only = $2;
                 my $file_content = &Apache::lonnet::getfile($file);
-                if (open(my $fh,">$doc_zip_root/zipdir/$unique_path/$stuname/part$partid/resp$respid/$file_name_only")) {
+                if (open(my $fh,">$doc_zip_root/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid/$file_name_only")) {
                     print($fh $file_content);
                     close($fh);
                 } else {
@@ -103,13 +104,13 @@ if (&Apache::lonnet::allowed('vgr',$scop
             }
         }
     }
-    mkdir($doc_zip_root."/zipout",0777);
-    my $statement = "cd $doc_zip_root/zipdir/$unique_path\n";
-    $statement .= "zip -r $doc_zip_root/zipout/output.zip * > /dev/null";
+    mkdir($doc_zip_root."/zipout/$uname$udom",0700);
+    my $statement = "cd $doc_zip_root/zipdir/$uname$udom/$unique_path\n";
+    $statement .= "zip -r $doc_zip_root/zipout/$uname$udom/output.zip * > /dev/null";
     system($statement);
-    $statement = "rm -rf $doc_zip_root/zipdir/$unique_path";
+    $statement = "rm -rf $doc_zip_root/zipdir/$uname$udom/$unique_path";
     system($statement);
-    print('<a href="/zipspool/zipout/output.zip">Click to download</a><br />');
+    print('<a href="/zipspool/zipout/'.$uname.$udom.'/output.zip">Click to download</a><br />');
 } else {
     print('You are not authorized to download student submissions.');
 }