Index: openacs-4/packages/dotlrn-fs/dotlrn-fs.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/dotlrn-fs.info,v
diff -u -N -r1.26.2.5 -r1.26.2.6
--- openacs-4/packages/dotlrn-fs/dotlrn-fs.info	4 Apr 2006 15:22:02 -0000	1.26.2.5
+++ openacs-4/packages/dotlrn-fs/dotlrn-fs.info	18 May 2006 11:07:10 -0000	1.26.2.6
@@ -7,12 +7,12 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="2.2.0a2" url="http://openacs.org/repository/download/apm/dotlrn-fs-2.2.0a2.apm">
+    <version name="2.2.0a3" url="http://openacs.org/repository/download/apm/dotlrn-fs-2.2.0a3.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2005-11-01</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
 
-        <provides url="dotlrn-fs" version="2.2.0a2"/>
+        <provides url="dotlrn-fs" version="2.2.0a3"/>
         <requires url="dotlrn" version="2.2.0a1"/>
         <requires url="file-storage" version="4.7d3"/>
         <requires url="fs-portlet" version="2.2.0a1"/>
@@ -27,6 +27,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="dotlrn_community_default_folders"  description="Default folders for communities of type dotlrn_community, most likely subcommunities."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="WritePermissionForMembersP"  default="1"  description="Should the community members get the write permission to the folders?"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="WritePermissionForMembersOnPublicP"  default="0"  description="Should the community members get the write permission to the public folder?"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="InheritPermissionsForRootFolderP"  default="0"  description="Should the root folder inherit permissions from the community?"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl,v
diff -u -N -r1.90.2.4 -r1.90.2.5
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	19 Apr 2006 21:52:58 -0000	1.90.2.4
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	18 May 2006 11:07:10 -0000	1.90.2.5
@@ -73,7 +73,11 @@
             set node_id [site_node::get_node_id_from_object_id -object_id $package_id]
             site_node_object_map::new -object_id $folder_id -node_id $node_id
 
-            permission::set_not_inherit -object_id $folder_id
+	    if {![parameter::get_from_package_key -package_key "dotlrn-fs" -parameter "InheritPermissionsForRootFolderP"]} {
+		permission::set_not_inherit -object_id $folder_id
+	    } else {
+		permission::set_inherit -object_id $folder_id
+	    }
 
             set party_id [acs_magic_object registered_users]
             permission::grant -party_id $party_id -object_id $folder_id -privilege read
@@ -108,8 +112,13 @@
         set node_id [site_node::get_node_id_from_object_id -object_id $package_id]
         site_node_object_map::new -object_id $folder_id -node_id $node_id
 
-        permission::set_not_inherit -object_id $folder_id
+	if {![parameter::get_from_package_key -package_key "dotlrn-fs" -parameter "InheritPermissionsForRootFolderP"]} {
+	    permission::set_not_inherit -object_id $folder_id
+	} else {
+	    permission::set_inherit -object_id $folder_id
+	}
 
+
         # Set up permissions on these folders
         # The root folder is available only to community members
         set members [dotlrn_community::get_rel_segment_id \