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 -N -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 @@ f f - + OpenACS Collaborative document storage 2017-08-06 @@ -17,7 +17,7 @@ 2 #file-storage.file-storage# - + 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 -N -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 @@ Herunterladen Als ZIP-Datei herunterladen Markierte Elemente als ZIP-Datei herunterladen + Archiv wird erstellt, bitte warten... + Ihre ZIP-Datei w�rde erfolgreich herstellt. <a title="ZIP-Datei" href="%file_url%">Herunterladen</a> Bearbeiten Umbenennen Datei bearbeiten 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 -N -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 @@ Download Download as a ZIP file Download checked items as a ZIP file + Creating archive, please wait... + Your ZIP file is ready. <a title="ZIP file" href="%file_url%">Download</a> Edit edit Edit File 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 -N -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 @@ Scarica Scarica come file ZIP Scarica gli elementi selezionati come file ZIP + Stiamo generando l'archivio, ti preghiamo di attendere... + Il tuo file ZIP � pronto. <a title="File ZIP" href="%file_url%">Scarica</a> Modifica modifica Edita File Index: openacs-4/packages/file-storage/www/download-zip-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/download-zip-2.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/file-storage/www/download-zip-2.tcl 18 Jun 2021 17:05:55 -0000 1.1.2.1 @@ -0,0 +1,30 @@ +ad_page_contract { + Download a file that has been exported in the previous UI. +} { + {f:verify} + {n:verify} + {u:verify} +} + +auth::require_login + +if {![file exists $f] || + [ad_conn user_id] != $u} { + ns_returnnotfound + ad_script_abort +} + +# return the archive to the connection. +ns_set put [ad_conn outputheaders] Content-Disposition "attachment;filename=\"$n\"" +ns_set put [ad_conn outputheaders] Content-Type "application/zip" +ns_set put [ad_conn outputheaders] Content-Size [ad_file size $f] +ns_returnfile 200 application/octet-stream $f + +# clean everything up +file delete -- $f + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: 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 -N -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 }