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.38.2.11 -r1.38.2.12
--- openacs-4/packages/file-storage/file-storage.info	29 Mar 2006 01:26:44 -0000	1.38.2.11
+++ openacs-4/packages/file-storage/file-storage.info	6 Apr 2006 01:27:47 -0000	1.38.2.12
@@ -33,6 +33,7 @@
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowTextEdit"  default="0" description="Allow users to edit the content of text based files in their browser."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowTextEdit"  default="0" description="Allow users to edit the content of text based files in their browser."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ArchiveCommand"  default="tar cf - {in_file} | gzip &gt; {out_file}" description="Program (and program options) to use for archiving file storage objects. Use the special tags {in_file} and {out_file} (including the curly braces) to denote the locations of the input and output files on the command line."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ArchiveExtension"  default="tgz" description="The extension that the programmer should add to the output file. This depends on the value of ArchiveCommand"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="BehaveLikeFilesystemP"  default="0" description="Switch to use file-title for download instead of original filename"/>
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.12.2.5 -r1.12.2.6
--- openacs-4/packages/file-storage/www/file-add.tcl	26 Sep 2005 09:00:19 -0000	1.12.2.5
+++ openacs-4/packages/file-storage/www/file-add.tcl	6 Apr 2006 01:27:47 -0000	1.12.2.6
@@ -126,7 +126,7 @@
     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] } {
+    if { $unpack_p && ![empty_string_p $unzip_binary] && [file extension [template::util::file::get_property filename $upload_file]] eq ".zip"  } {
 	
 	set path [ns_tmpnam]
 	file mkdir $path
@@ -151,7 +151,7 @@
     }
     set mime_type ""
     if { [empty_string_p [lindex $upload_files 0]]} {
-        if {[empty_string_p [template::util::richtext::get_property html_value $content_body]] } {
+        if {[parameter::get -parameter AllowTextEdit -default 0] && [empty_string_p [template::util::richtext::get_property html_value $content_body]] } {
             ad_return_complaint 1 "You have to upload a file or create a new one"
             ad_script_abort
         }