Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.31.2.18 -r1.31.2.19
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	5 Apr 2006 01:03:41 -0000	1.31.2.18
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	17 May 2006 21:07:03 -0000	1.31.2.19
@@ -44,7 +44,7 @@
 }
 
 if {![exists_and_not_null fs_url]} {
-    set fs_url ""
+    set fs_url [ad_conn package_url]
 }
 
 set folder_name [lang::util::localize [fs::get_object_name -object_id  $folder_id]]
@@ -74,8 +74,10 @@
 # for now, invite users to upload, and then they will be asked to
 # login if they are not.
 
+set cancel_url "[ad_conn url]?[ad_conn query]"
+set add_url [export_vars -base "${fs_url}file-add" {folder_id}]
 
-lappend actions "#file-storage.Add_File#" ${fs_url}file-add?[export_vars folder_id] "[_ file-storage.lt_Upload_a_file_in_this]" "#file-storage.Create_a_URL#" ${fs_url}simple-add?[export_vars folder_id] "[_ file-storage.lt_Add_a_link_to_a_web_p]" "#file-storage.New_Folder#" ${fs_url}folder-create?[export_vars {{parent_id $folder_id}}] "#file-storage.Create_a_new_folder#" "[_ file-storage.lt_Upload_compressed_fol]" ${fs_url}folder-zip-add?[export_vars folder_id] "[_ file-storage.lt_Upload_a_compressed_f]"
+lappend actions "#file-storage.Add_File#" [export_vars -base "${fs_url}file-upload-confirm" {folder_id cancel_url {return_url $add_url}}] "[_ file-storage.lt_Upload_a_file_in_this]" "#file-storage.Create_a_URL#" ${fs_url}simple-add?[export_vars folder_id] "[_ file-storage.lt_Add_a_link_to_a_web_p]" "#file-storage.New_Folder#" ${fs_url}folder-create?[export_vars {{parent_id $folder_id}}] "#file-storage.Create_a_new_folder#" "[_ file-storage.lt_Upload_compressed_fol]" ${fs_url}folder-zip-add?[export_vars folder_id] "[_ file-storage.lt_Upload_a_compressed_f]"
 
 set expose_rss_p [parameter::get -parameter ExposeRssP -package_id $package_id -default 0]
 set like_filesystem_p [parameter::get -parameter BehaveLikeFilesystemP -default 1]