--- loncom/interface/multidownload.pl	2007/04/25 00:32:49	1.4
+++ 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.4 2007/04/25 00:32:49 banghart Exp $
+# $Id: multidownload.pl,v 1.9 2007/04/26 18:30:38 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,10 +44,6 @@ use Apache::lonnet;
 use LONCAPA::Enrollment;
 use strict;
 
-sub is_student {
-    return ($env{'request.role'}=~/^st\./);
-}
-
 $|=1;
 if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
     print <<END;
@@ -65,10 +61,14 @@ END
 &Apache::lonlocal::get_language_handle();
 &Apache::loncommon::content_type(undef,'text/html');
 my $identifier = $ENV{'QUERY_STRING'};
+my $unique_path = $identifier.time();
 print(&Apache::loncommon::start_page('Multiple Downloads'));
-$env{'request.role'} =~ m/^(.+)\./;
-my $role = $1;
-if ($role eq 'cc') {
+
+my $scope = $env{'request.course.id'};
+if ($env{'request.course.sec'}) {
+    $scope .= '/'.$env{'request.course.sec'};
+}
+if (&Apache::lonnet::allowed('vgr',$scope) eq 'F') {
     my $symb = $env{'cgi.'.$identifier.'.symb'};
     my $courseid = $env{'request.course.id'};
     my @stuchecked = split(/\n/,$env{'cgi.'.$identifier.'.students'});
@@ -77,21 +77,25 @@ if ($role eq 'cc') {
     my @part_response_id = &Apache::grades::flatten_responseType($responseType);
     my $doc_zip_root = $Apache::lonnet::perlvar{'lonZipDir'};
     my ($partlist,$handgrade,$responseType) = &Apache::grades::response_type($symb);
-    mkdir($doc_zip_root."/zipdir",0777);
+    my $uname = $env{'user.name'};
+    my $udom = $env{'user.domain'};
+    mkdir($doc_zip_root."/zipdir",0700);
+    mkdir($doc_zip_root."/zipdir/$uname$udom",0700);
+    mkdir($doc_zip_root."/zipdir/$uname$udom/$unique_path",0700);
     foreach my $stu (@stuchecked) {
-        my ($uname,$udom,$fullname) = split(/:/,$stu);
-        mkdir($doc_zip_root."/zipdir/$uname",0777);
-        my %record = &Apache::lonnet::restore($symb,$courseid,$udom,$uname);
+        my ($stuname,$studom,$fullname) = split(/:/,$stu);
+        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/$uname/part$partid",0777);
-            mkdir($doc_zip_root."/zipdir/$uname/part$partid/resp$respid",0777);
-            my $files = &Apache::grades::get_submitted_files($udom,$uname,$partid,$respid,\%record);
+            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/$uname/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 {
@@ -100,14 +104,15 @@ if ($role eq 'cc') {
             }
         }
     }
-    mkdir($doc_zip_root."/zipout",0777);
-    my $statement = "zip -r $doc_zip_root/zipout/output.zip $doc_zip_root/zipdir/* > /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";
+    $statement = "rm -rf $doc_zip_root/zipdir/$uname$udom/$unique_path";
     system($statement);
-    print('<a href="../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.');
 }
-# print($env{'request.role'}.' == roles <br />');
-return 1;
+1;
+__END__;