Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -r1.60.2.14 -r1.60.2.15
--- openacs-4/packages/file-storage/file-storage.info	3 May 2021 06:50:44 -0000	1.60.2.14
+++ openacs-4/packages/file-storage/file-storage.info	18 Jun 2021 17:05:54 -0000	1.60.2.15
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="5.10.0d15" url="http://openacs.org/repository/download/apm/file-storage-5.10.0d15.apm">
+    <version name="5.10.0d16" url="http://openacs.org/repository/download/apm/file-storage-5.10.0d16.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Collaborative document storage</summary>
         <release-date>2017-08-06</release-date>
@@ -17,7 +17,7 @@
         <maturity>2</maturity>
         <package_instance_name>#file-storage.file-storage#</package_instance_name>
 
-        <provides url="file-storage" version="5.10.0d15"/>
+        <provides url="file-storage" version="5.10.0d16"/>
         <requires url="acs-kernel" version="5.9.1"/>
         <requires url="acs-tcl" version="5.10.0d38"/>
         <requires url="acs-content-repository" version="5.10.0d14"/>
Index: openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml,v
diff -u -r1.20 -r1.20.2.1
--- openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml	7 Aug 2017 23:48:11 -0000	1.20
+++ openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml	18 Jun 2021 17:05:54 -0000	1.20.2.1
@@ -41,6 +41,8 @@
   <msg key="Download">Herunterladen</msg>
   <msg key="Download_ZIP">Als ZIP-Datei herunterladen</msg>
   <msg key="Download_ZIP_Checked_Items">Markierte Elemente als ZIP-Datei herunterladen</msg>
+  <msg key="download_zip_creating_archive_msg">Archiv wird erstellt, bitte warten...</msg>
+  <msg key="download_zip_file_is_ready_msg">Ihre ZIP-Datei w�rde erfolgreich herstellt. &lt;a title=&#34;ZIP-Datei&#34; href=&#34;%file_url%&#34;&gt;Herunterladen&lt;/a&gt;</msg>
   <msg key="Edit">Bearbeiten</msg>
   <msg key="edit">Umbenennen</msg>
   <msg key="Edit_File">Datei bearbeiten</msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml,v
diff -u -r1.43.2.3 -r1.43.2.4
--- openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	3 Feb 2020 23:13:38 -0000	1.43.2.3
+++ openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	18 Jun 2021 17:05:54 -0000	1.43.2.4
@@ -40,6 +40,8 @@
   <msg key="Download">Download</msg>
   <msg key="Download_ZIP">Download as a ZIP file</msg>
   <msg key="Download_ZIP_Checked_Items">Download checked items as a ZIP file</msg>
+  <msg key="download_zip_creating_archive_msg">Creating archive, please wait...</msg>
+  <msg key="download_zip_file_is_ready_msg">Your ZIP file is ready. &lt;a title=&#34;ZIP file&#34; href=&#34;%file_url%&#34;&gt;Download&lt;/a&gt;</msg>
   <msg key="Edit">Edit</msg>
   <msg key="edit">edit</msg>
   <msg key="Edit_File">Edit File</msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml,v
diff -u -r1.19 -r1.19.2.1
--- openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml	7 Aug 2017 23:48:11 -0000	1.19
+++ openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml	18 Jun 2021 17:05:55 -0000	1.19.2.1
@@ -40,6 +40,8 @@
   <msg key="Download">Scarica</msg>
   <msg key="Download_ZIP">Scarica come file ZIP</msg>
   <msg key="Download_ZIP_Checked_Items">Scarica gli elementi selezionati come file ZIP</msg>
+  <msg key="download_zip_creating_archive_msg">Stiamo generando l&#39;archivio, ti preghiamo di attendere...</msg>
+  <msg key="download_zip_file_is_ready_msg">Il tuo file ZIP � pronto. &lt;a title=&#34;File ZIP&#34; href=&#34;%file_url%&#34;&gt;Scarica&lt;/a&gt;</msg>
   <msg key="Edit">Modifica</msg>
   <msg key="edit">modifica</msg>
   <msg key="Edit_File">Edita File</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/download-zip-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/file-storage/www/download-zip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download-zip.tcl,v
diff -u -r1.9.2.10 -r1.9.2.11
--- openacs-4/packages/file-storage/www/download-zip.tcl	18 Jun 2021 15:01:48 -0000	1.9.2.10
+++ openacs-4/packages/file-storage/www/download-zip.tcl	18 Jun 2021 17:05:55 -0000	1.9.2.11
@@ -25,6 +25,9 @@
 
 ad_try {
 
+    ad_progress_bar_begin \
+        -title [_ file-storage.download_zip_creating_archive_msg]
+
     set user_id [ad_conn user_id]
 
     # copy all files together in a temporary folder on the filesystem
@@ -53,22 +56,31 @@
     }
     set download_name [fs::get_file_system_safe_object_name -object_id $object_name_id].zip
 
-    # return the archive to the connection.
-    ns_set put [ad_conn outputheaders] Content-Disposition "attachment;filename=\"$download_name\""
-    ns_set put [ad_conn outputheaders] Content-Type "application/zip"
-    ns_set put [ad_conn outputheaders] Content-Size [ad_file size $out_file]
-    ns_returnfile 200 application/octet-stream $out_file
+    set n $download_name
+    set f $out_file
+    set u $user_id
+    set file_url [export_vars -base ./download-zip-2 {
+        f:sign(max_age=300)
+        n:sign(max_age=300)
+        u:sign(max_age=300)
+    }]
 
+    util_user_message \
+        -html \
+        -message [_ file-storage.download_zip_file_is_ready_msg \
+                      [list file_url [ns_quotehtml $file_url]]]
+
+    ad_progress_bar_end \
+        -url $return_url
+
 } on error {errorMsg} {
 
-    # some day we'll do something useful here
     error $errorMsg
 
 } finally {
 
     # clean everything up
     file delete -force -- $in_path
-    file delete -- $out_file
 
 }