Index: openacs-4/packages/file-storage/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.tcl,v
diff -u -r1.8.2.3 -r1.8.2.4
--- openacs-4/packages/file-storage/www/file-add.tcl	21 Jul 2004 22:37:18 -0000	1.8.2.3
+++ openacs-4/packages/file-storage/www/file-add.tcl	26 Jul 2004 23:57:01 -0000	1.8.2.4
@@ -8,6 +8,7 @@
     file_id:integer,optional,notnull
     folder_id:integer,optional,notnull
     upload_file:trim,optional
+    return_url:optional
     upload_file.tmpfile:tmpfile,optional
     {title ""}
     {lock_title_p 1}
@@ -20,7 +21,7 @@
 } -validate {
     file_id_or_folder_id {
 	if {[exists_and_not_null file_id] && ![exists_and_not_null folder_id]} {
-	    set folder_id [db_string get_folder_id "" -default ""]
+	    set folder_id [db_string get_folder_id "select parent_id as folder_id from cr_items where item_id=:file_id;" -default ""]
 	}
 	if {![fs_folder_p $folder_id]} {
 	    ad_complain "The specified parent folder is not valid."
@@ -49,7 +50,7 @@
 	-object_id $file_id \
 	-party_id $user_id \
 	-privilege "write"
-set context [fs_context_bar_list -final "[_ file-storage.Add_Revision]" $folder_id]
+    set context [fs_context_bar_list -final "[_ file-storage.Add_Revision]" $folder_id]
     
 } else {
     set context [fs_context_bar_list -final "[_ file-storage.Add_File]" $folder_id]
@@ -64,6 +65,12 @@
     {upload_file:file {label \#file-storage.Upload_a_file\#} {html "size 30"}}
 }
 
+if {[exists_and_not_null return_url]} {
+    ad_form -extend -form {
+	{return_url:text(hidden) {value $return_url}}
+    }
+}
+
 if {$lock_title_p} {
     ad_form -extend -form {
 	{title_display:text(inform) {label \#file-storage.Title\#} }
@@ -77,59 +84,59 @@
 
 ad_form -extend -form {
     {description:text(textarea),optional {label \#file-storage.Description\#} {html "rows 5 cols 35"}}
-
+    
 }
 
 if {[ad_form_new_p -key file_id]} { 
     ad_form -extend -form {
-    {unpack_p:boolean(checkbox),optional {label \#file-storage.Multiple_files\#} {html {onclick "javascript:UnpackChanged(this);"}} {options { {\#file-storage.lt_This_is_a_ZIP\# t} }} }
+	{unpack_p:boolean(checkbox),optional {label \#file-storage.Multiple_files\#} {html {onclick "javascript:UnpackChanged(this);"}} {options { {\#file-storage.lt_This_is_a_ZIP\# t} }} }
     }
 }
 
 ad_form -extend -form {} -select_query_name {get_file} -new_data {
-
-
-set unpack_p [template::util::is_true $unpack_p]
-set unzip_binary [string trim [parameter::get -parameter UnzipBinary]]
-
-if { $unpack_p && ![empty_string_p $unzip_binary] } {
     
-    set path [ns_tmpnam]
-    file mkdir $path
 
-    
-    catch { exec $unzip_binary -jd $path ${upload_file.tmpfile} } errmsg
+    set unpack_p [template::util::is_true $unpack_p]
+    set unzip_binary [string trim [parameter::get -parameter UnzipBinary]]
 
-    # More flexible parameter design could be:
-    # zip {unzip -jd {out_path} {in_file}} tar {tar xf {in_file} {out_path}} tgz {tar xzf {in_file} {out_path}} 
-
-    set upload_files [list]
-    set upload_tmpfiles [list]
-    
-    foreach file [glob -nocomplain "$path/*"] {
-        lappend upload_files [file tail $file]
-        lappend upload_tmpfiles $file
+    if { $unpack_p && ![empty_string_p $unzip_binary] } {
+	
+	set path [ns_tmpnam]
+	file mkdir $path
+	
+	
+	catch { exec $unzip_binary -jd $path ${upload_file.tmpfile} } errmsg
+	
+	# More flexible parameter design could be:
+	# zip {unzip -jd {out_path} {in_file}} tar {tar xf {in_file} {out_path}} tgz {tar xzf {in_file} {out_path}} 
+	
+	set upload_files [list]
+	set upload_tmpfiles [list]
+	
+	foreach file [glob -nocomplain "$path/*"] {
+	    lappend upload_files [file tail $file]
+	    lappend upload_tmpfiles $file
+	}
+	
+    } else {
+	set upload_files [list [template::util::file::get_property filename $upload_file]]
+	set upload_tmpfiles [list [template::util::file::get_property tmp_filename $upload_file]]
     }
-
-} else {
-    set upload_files [list [template::util::file::get_property filename $upload_file]]
-    set upload_tmpfiles [list [template::util::file::get_property tmp_filename $upload_file]]
-}
-
+    
     foreach upload_file $upload_files tmpfile $upload_tmpfiles {
 	set this_file_id $file_id
 	set this_title $title
 	# upload a new file
 	# if the user choose upload from the folder view
 	# and the file with the same name already exists
 	# we create a new revision
-
+	
 	if {[string equal $this_title ""]} {
 	    set this_title $upload_file
 	}
 	
 	set existing_item_id [fs::get_item_id -name $upload_file -folder_id $folder_id]
-
+	
 	if {![empty_string_p $existing_item_id]} {
 	    # file with the same name already exists
 	    # in this folder, create a new revision
@@ -150,29 +157,28 @@
 	    -title $this_title \
 	    -description $description \
 	    -package_id $package_id
-
+	
     }
     
-    fs::do_notifications -folder_id $folder_id -filename $title -file_id $file_id -action "new_file"
-
 } -edit_data {
 
     fs::add_version \
 	-name [template::util::file::get_property filename $upload_file] \
 	-tmp_filename [template::util::file::get_property tmp_filename $upload_file] \
         -item_id $file_id \
-	-parent_id $folder_id \
 	-creation_user $user_id \
 	-creation_ip [ad_conn peeraddr] \
 	-title $title \
 	-description $description \
-	-package_id $package_id
-
-    fs::do_notifications -folder_id $folder_id -filename $title -file_id $file_id -action "new_version"
-
+	-package_id $package_id \
+	
 } -after_submit {
 
-    ad_returnredirect "./?[export_url_vars folder_id]"
+    if {[exists_and_not_null return_url]} {
+	ad_returnredirect $return_url
+    } else {
+	ad_returnredirect "./?[export_url_vars folder_id]"
+    }
     ad_script_abort
 
 }