Index: openacs-4/packages/file-storage/www/folder-zip-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-zip-add.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/file-storage/www/folder-zip-add.tcl	27 Jun 2015 21:41:49 -0000	1.7
+++ openacs-4/packages/file-storage/www/folder-zip-add.tcl	7 Aug 2017 23:48:11 -0000	1.8
@@ -7,8 +7,8 @@
 } {
     file_id:naturalnum,optional,notnull
     folder_id:naturalnum,optional,notnull
-    upload_file:trim,optional
-    return_url:optional
+    upload_file:trim,optional,notnull
+    return_url:localurl,optional
     upload_file.tmpfile:tmpfile,optional
     {title ""}
     {lock_title_p:boolean 0}
@@ -20,10 +20,13 @@
     lock_title_p:onevalue
 } -validate {
     file_id_or_folder_id {
-        if {([info exists file_id] && $file_id ne "") && (![info exists folder_id] || $folder_id eq "")} {
-            set folder_id [db_string get_folder_id "select parent_id as folder_id from cr_items where item_id=:file_id" -default ""]
+        if {[info exists file_id] && $file_id ne ""
+            && (![info exists folder_id] || $folder_id eq "")} {
+            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]} {
+        if {![info exists folder_id] || ![fs_folder_p $folder_id]} {
             ad_complain "The specified parent folder is not valid."
         }
     }
@@ -187,7 +190,7 @@
 			-title $this_title \
 			-package_id $package_id]
 	
-	file delete $tmpfile
+	file delete -- $tmpfile
 	incr i
 
 	if {$rev_id ne ""} {
@@ -204,9 +207,9 @@
 	
     }
     if {$unzip_path ne ""} {
-	file delete -force $unzip_path
+	file delete -force -- $unzip_path
     }
-    file delete $upload_file.tmpfile
+    file delete -- $upload_file.tmpfile
 } -edit_data {
     fs::add_version \
 	-name [template::util::file::get_property filename $upload_file] \
@@ -231,3 +234,9 @@
 set unpack_available_p [expr {[string trim [parameter::get -parameter UnzipBinary]] ne ""}]
 
 ad_return_template
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: