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.13 -r1.31.2.14
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	28 Sep 2005 13:50:38 -0000	1.31.2.13
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	24 Oct 2005 11:18:10 -0000	1.31.2.14
@@ -89,9 +89,8 @@
     lappend actions "#file-storage.Delete_this_folder#" ${fs_url}folder-delete?[export_vars folder_id] "#file-storage.Delete_this_folder#"
 }
 if {$admin_p} {
-    set return_url [ad_conn url]
     lappend actions "#file-storage.Edit_Folder#" "${fs_url}folder-edit?folder_id=$folder_id" "#file-storage.Rename_this_folder#"
-    lappend actions "#file-storage.lt_Modify_permissions_on_1#" "${fs_url}permissions?[export_vars -override {{object_id $folder_id}} {return_url}]" "#file-storage.lt_Modify_permissions_on_1#"
+    lappend actions "#file-storage.lt_Modify_permissions_on_1#" "${fs_url}permissions?[export_vars -override {{object_id $folder_id}} {{return_url "[ad_conn url]"}}]" "#file-storage.lt_Modify_permissions_on_1#"
     if { $expose_rss_p } {
 	lappend actions "Configure RSS" "${fs_url}admin/rss-subscrs?folder_id=$folder_id" "Configure RSS"
     }
@@ -133,7 +132,9 @@
 		       link_url_col download_url]
 	      ]
 
-set return_url [export_vars -base "index" {folder_id}]
+if {![exists_and_not_null return_url]} {
+    set return_url [export_vars -base "index" {folder_id}]
+}
 set vars_to_export [list return_url]
 
 if {$allow_bulk_actions} {
@@ -146,6 +147,7 @@
     set bulk_actions ""
 }
 
+
 if {$format eq "list"} { 
     set actions {}
 } 
Index: openacs-4/packages/file-storage/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.adp,v
diff -u -r1.31.2.5 -r1.31.2.6
--- openacs-4/packages/file-storage/www/index.adp	25 Aug 2005 21:05:45 -0000	1.31.2.5
+++ openacs-4/packages/file-storage/www/index.adp	24 Oct 2005 11:18:10 -0000	1.31.2.6
@@ -19,7 +19,7 @@
 </tr>
 </table>
 <include src="folder-chunk" folder_id="@folder_id@"
-    n_past_days="@n_past_days@" allow_bulk_actions="1" >
+    n_past_days="@n_past_days@" allow_bulk_actions="1" return_url="@return_url@">
 
 
 <p>@notification_chunk;noquote@</p>
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -r1.27.2.4 -r1.27.2.5
--- openacs-4/packages/file-storage/www/index.tcl	31 Aug 2005 14:33:13 -0000	1.27.2.4
+++ openacs-4/packages/file-storage/www/index.tcl	24 Oct 2005 11:18:10 -0000	1.27.2.5
@@ -9,6 +9,7 @@
     {folder_id:integer [fs_get_root_folder]}
     {n_past_days:integer "99999"}
     {orderby:optional}
+    {return_url ""}
 } -validate {
     valid_folder -requires {folder_id:integer} {
 	if {![fs_folder_p $folder_id]} {
@@ -114,6 +115,11 @@
     }
 }
 
+# Check if the user has permissions. If not, don't care
+if {![empty_string_p $project_item_id] && ![permission::permission_p -object_id $project_item_id -privilege "read"]} {
+    set project_url {}
+}
+
 set up_url {}
 if { !${root_folder_p}} {
     if {[llength $context] == 1} {
@@ -137,4 +143,5 @@
 
 set allow_bulk_actions 1
 
+
 ad_return_template
Index: openacs-4/packages/file-storage/www/download/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download/index.vuh,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/file-storage/www/download/index.vuh	29 Jun 2004 10:18:27 -0000	1.4
+++ openacs-4/packages/file-storage/www/download/index.vuh	24 Oct 2005 11:18:10 -0000	1.4.2.1
@@ -21,4 +21,5 @@
 
 ad_require_permission $version_id "read"
 
-cr_write_content -revision_id $version_id
+# cr_write_content -revision_id $version_id
+cr_write_content -item_id $file_id
\ No newline at end of file