Index: openacs-4/packages/file-storage/www/admin/dav-enable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/admin/Attic/dav-enable.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/file-storage/www/admin/dav-enable.tcl	15 Nov 2003 21:41:07 -0000	1.1.2.1
+++ openacs-4/packages/file-storage/www/admin/dav-enable.tcl	24 Jan 2004 18:40:09 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-# 
+# packages/file-storage-dav/www/admin/dav-enable.tcl
 ad_page_contract {
     
      enable WebDAV support for this package instance
@@ -9,30 +9,28 @@
      
 } {
     
-    
-    
+    package_id:integer
+    {return_url ""}
 } -properties {
 } -validate {
 } -errors {
 }
 
 set user_id [ad_conn user_id]
-set package_id [ad_conn package_id]
-array set sn [site_node::get -url [ad_conn url]]
+array set sn [site_node::get_from_object_id -object_id $package_id]
 set node_id $sn(node_id)
-set folder_id [fs::get_root_folder]
+set folder_id [fs::get_root_folder -package_id $package_id]
 permission::require_permission \
     -object_id $package_id \
     -party_id $user_id \
     -privilege "admin"
 
-if {[apm_package_installed_p "oacs-dav"]} {
 
-    if {[empty_string_p [oacs_dav::request_folder_id $node_id]]} {
+    if {[empty_string_p [oacs_dav::request_folder_id $package_id]]} {
 	oacs_dav::register_folder $folder_id $node_id
     }
     
-}
 
+
 ad_returnredirect "."
 ad_script_abort
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/index-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/index-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/file-storage/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/admin/Attic/index.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/file-storage/www/admin/index.adp	15 Nov 2003 21:41:07 -0000	1.1.2.1
+++ openacs-4/packages/file-storage/www/admin/index.adp	24 Jan 2004 18:40:09 -0000	1.1.2.2
@@ -2,14 +2,14 @@
   <property name="title">@title@</property>
   <property name="context">@context@</property>
 
-  <if @dav_installed_p@ eq 1>
-    <p>WedDAV support is installed.</p>
-    <if @dav_enabled_p@ eq 1>
-      <p>@package_name@ is WebDAV enabled. <a
-    href="dav-disable">Disable WebDAV support</a>.</p>
-    </if>
-    <else>
-      <p>@package_name@ is not WebDAV enabled. You may <a
-      href="dav-enable">enable WedDAV support</a> for @package_name@.</p>
-    </else>
+  <if @fs_folders:rowcount@ gt 0>
+  <multiple name="fs_folders">
+    @fs_folders.label@ : @fs_folders.url@ <if @fs_folders.dav_enabled_p@
+    eq 0><a
+    href="/file-storage-dav/admin/dav-enable?package_id=@fs_folders.package_id@">Enable</a></if><else><a
+    href="/file-storage-dav/admin/dav-disable?package_id=@fs_folders.package_id@">Disable</else><br />
+  </multiple>
   </if>
+  <else>
+    No file storage folders exist
+  </else>
\ No newline at end of file
Index: openacs-4/packages/file-storage/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/admin/Attic/index.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/file-storage/www/admin/index.tcl	15 Nov 2003 21:41:07 -0000	1.1.2.1
+++ openacs-4/packages/file-storage/www/admin/index.tcl	24 Jan 2004 18:40:09 -0000	1.1.2.2
@@ -33,3 +33,6 @@
     set dav_enabled_p 0
 }
 
+db_multirow fs_folders file_storage_folders ""
+
+ad_return_template