Index: openacs-4/packages/file-storage/www/folder-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk-oracle.xql,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/file-storage/www/folder-chunk-oracle.xql	26 Jan 2004 15:39:47 -0000	1.8
+++ openacs-4/packages/file-storage/www/folder-chunk-oracle.xql	25 Mar 2004 02:28:40 -0000	1.8.2.1
@@ -23,17 +23,7 @@
                      when fs_objects.last_modified >= (sysdate - :n_past_days)
                      then 1
                      else 0
-                   end as new_p,
-                   case
-                     when type = 'url'
-                     then acs_permission.permission_p(fs_objects.object_id, :viewing_user_id, 'delete')
-                     else 't'
-                   end as delete_p,
-                   case
-                     when type = 'url'
-                     then acs_permission.permission_p(fs_objects.object_id, :viewing_user_id, 'write')
-                     else 't'
-                   end as write_p
+                   end as new_p
             from fs_objects
             where fs_objects.parent_id = :folder_id
               and exists (select 1
Index: openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql	26 Jan 2004 15:39:47 -0000	1.10
+++ openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql	25 Mar 2004 02:28:40 -0000	1.10.2.1
@@ -23,17 +23,7 @@
                      when fs_objects.last_modified >= (now() - cast('$n_past_days days' as interval))
                      then 1
                      else 0
-                   end as new_p,
-                   case
-                     when type = 'url'
-                     then acs_permission__permission_p(fs_objects.object_id, :viewing_user_id, 'delete')
-                     else 't'
-                   end as delete_p,
-                   case
-                     when type = 'url'
-                     then acs_permission__permission_p(fs_objects.object_id, :viewing_user_id, 'write')
-                     else 't'
-                   end as write_p
+                   end as new_p
             from fs_objects
             where fs_objects.parent_id = :folder_id
               and exists (select 1
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.21.2.1 -r1.21.2.2
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	24 Mar 2004 02:25:43 -0000	1.21.2.1
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	25 Mar 2004 02:28:41 -0000	1.21.2.2
@@ -17,11 +17,24 @@
     ad_script_abort
 }
 
-set viewing_user_id [ad_conn user_id]
+#set viewing_user_id [ad_conn user_id]
 
 permission::require_permission -party_id $viewing_user_id -object_id $folder_id -privilege "read"
+
 set admin_p [permission::permission_p -party_id $viewing_user_id -object_id $folder_id -privilege "admin"]
 
+set write_p $admin_p
+
+if {!$write_p} {
+    set write_p [permission::permission_p -party_id $viewing_user_id -object_id $folder_id -privilege "write"]
+}
+
+set delete_p $admin_p
+
+if {!$delete_p} {
+    set delete_p [permission::permission_p -party_id $viewing_user_id -object_id $folder_id -privilege "delete"]
+}
+
 if {![exists_and_not_null n_past_days]} {
     set n_past_days 99999
 }
@@ -41,18 +54,24 @@
 set folder_path [db_exec_plsql get_folder_path {}]
 
 set actions [list]
-set actions [list "Upload File" file-add?[export_vars folder_id] "Upload a file in this folder" "Add Link" simple-add?[export_vars folder_id] "Add a link to a web page" "\#file-storage.New_Folder\#" folder-create?[export_vars {{parent_id $folder_id}}] "\#file-storage.Create_a_new_folder\#" ]
 
-#if {$delete_p} {
-#    lappend actions "Delete Folder" folder-delete "Delete folder and all contents"
-#}
+# for now, invite users to upload, and then they will be asked to
+# login if they are not.
+
+ lappend actions "Upload File" file-add?[export_vars folder_id] "Upload a file in this folder" "Add Link" simple-add?[export_vars folder_id] "Add a link to a web page" "\#file-storage.New_Folder\#" folder-create?[export_vars {{parent_id $folder_id}}] "\#file-storage.Create_a_new_folder\#"
+
+
+if {$delete_p} {
+    lappend actions "Delete Folder" folder-delete?[export_vars folder_id] "Delete folder"
+}
 if {$admin_p} {
     set return_url [ad_conn url]
     lappend actions "Rename Folder" "folder-edit?folder_id=$folder_id" "Change the name of this folder"
     lappend actions "Folder Permissions" "/permissions/one?[export_vars -override {{object_id $folder_id}} {return_url}]" "Change the permissions of this folder"
 }
 
 #set n_past_filter_values [list [list "Yesterday" 1] [list [_ file-storage.last_week] 7] [list [_ file-storage.last_month] 30]]
+
 set elements [list icon \
 		  [list label "" \
 		       display_template {<a href="@contents.file_url@"><img src="@contents.icon@"  border=0 alt="#file-storage.@contents.type@#" /></a>}] \