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.11 -r1.12
--- openacs-4/packages/file-storage/file-storage.info	2 Apr 2002 12:30:55 -0000	1.11
+++ openacs-4/packages/file-storage/file-storage.info	24 Apr 2002 20:06:25 -0000	1.12
@@ -136,6 +136,7 @@
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="StoreFilesInDatabaseP"  default="1" description="Flag to determine the storage type. A flag of 1 (true) will store the files in the database. If 0 (false) files are stored in the filesystem. ***This parameter should only be changed at package instance creation.***"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaximumFileSize"  default="2000000" description="The maximum size, in bytes, of files that users are allowed to upload"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowAdministerPermissionsLinkP"  default="1" description="Whether or not to show a link to administer permissions on the file storage object."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/file-storage/www/file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/file.adp	22 Apr 2002 14:28:31 -0000	1.5
+++ openacs-4/packages/file-storage/www/file.adp	24 Apr 2002 20:06:25 -0000	1.6
@@ -4,73 +4,73 @@
 <property name="context_bar">@context_bar@</property>
 
 <ul>
-  <li>Title: @title@ <if @write_p@ eq "t">(<a href="file-edit?file_id=@file_id@">edit</a>)</if>
+  <li>Title: @title@ <if @write_p@ true>(<a href="file-edit?file_id=@file_id@">edit</a>)</if>
   <li>Owner: @owner@
 <p>
   <li>Actions: 
-  <if @show_all_versions_p@ eq "t">
-    <a href="file?file_id=@file_id@&show_all_versions_p=f">show only
-    live version</a>
+  <if @show_all_versions_p@ true>
+    <a href="file?file_id=@file_id@&show_all_versions_p=f">show only live version</a>
   </if>
   <else>
-    <a href="file?file_id=@file_id@&show_all_versions_p=t">show all
-    versions</a>
+    <a href="file?file_id=@file_id@&show_all_versions_p=t">show all versions</a>
   </else>
-  <if @write_p@ eq "t">
-  | <a href="version-add?file_id=@file_id@">Upload a new version</a>
+  <if @write_p@ true>
+    | <a href="version-add?file_id=@file_id@">Upload a new version</a>
   </if>
-  | <a href="file-copy?file_id=@file_id@">Copy</a>
-  <if @write_p@ eq "t">
-  | <a href="file-move?file_id=@file_id@">Move</a>
+    | <a href="file-copy?file_id=@file_id@">Copy</a>
+  <if @write_p@ true>
+    | <a href="file-move?file_id=@file_id@">Move</a>
   </if>
-  <if @admin_p@ eq "t">
-  | <a href="/permissions/one?object_id=@file_id@">Modify permissions
-  on this file</a>
+  <if @admin_p@ true and @show_administer_permissions_link_p@ true>
+    | <a href="/permissions/one?object_id=@file_id@">Modify permissions on this file</a>
   </if>
-  <if @delete_p@ eq "t">
-  | <a href="file-delete?file_id=@file_id@">Delete this file (including all versions)</a>
+  <if @delete_p@ true>
+    | <a href="file-delete?file_id=@file_id@">Delete this file (including all versions)</a>
   </if>
 </ul>
 
 <table border=1 cellspacing=2 cellpadding=2>
- <tr>
-  <td colspan=7><if @show_all_versions_p@ eq "t">All Versions of "@title@"</if>
-   <else>Live version of "@title@"</else>.</td>
- </tr>
- <tr>
-  <td>Version filename</td>
-  <td>Author</td>
-  <td>Size (bytes)</td>
-  <td>Type</td>
-  <td>Modified</td>
-  <td>Version Notes</td>
-  <td>Actions</td>
- </tr>
+  <tr>
+    <td colspan=7>
+      <if @show_all_versions_p@ true>All Versions of "@title@"</if>
+      <else>Live version of "@title@"</else>.
+    </td>
+  </tr>
+  <tr>
+    <td>Version filename</td>
+    <td>Author</td>
+    <td>Size (bytes)</td>
+    <td>Type</td>
+    <td>Modified</td>
+    <td>Version Notes</td>
+    <td>Actions</td>
+  </tr>
 
 <multiple name=version>
- <tr>
-  <td><img src="graphics/file.gif"><a href="download/index?version_id=@version.version_id@">@version.title@</a></td>
-  <td>@version.author@</td>
-  <td align=right>@version.content_size@</td>
-  <td>@version.type@</td>
-  <td>@version.last_modified@</td>
-  <td>@version.description@</td>
-  <td>&nbsp;<if @version.delete_p@ eq "t">
+  <tr>
+    <td><img src="graphics/file.gif">
+      <a href="download/index?version_id=@version.version_id@">@version.title@</a>
+    </td>
+    <td>@version.author@</td>
+    <td align=right>@version.content_size@</td>
+    <td>@version.type@</td>
+    <td>@version.last_modified@</td>
+    <td>@version.description@</td>
+    <td>
+      &nbsp;<if @version.delete_p@ true>
       <a href="version-delete?version_id=@version.version_id@">delete</a> 
-       <if @version.admin_p@ eq "t">|</if>
+        <if @version.admin_p@ true and @show_administer_permissions_link_p@ true>|</if>
       </if>
-      <if @version.admin_p@ eq "t">
-      <a
-      href="/permissions/one?object_id=@version.version_id@">administer
-      permissions</a>
+      <if @version.admin_p@ true and @show_administer_permissions_link_p@ true>
+        <a href="/permissions/one?object_id=@version.version_id@">administer permissions</a>
       </if>
-  </td>
- </tr>
+    </td>
+  </tr>
 </multiple>
 
 <if @version:rowcount@ eq 0>
- <tr>
-  <td colspan=7><i>There are no versions of this file availible to you</i></td>
- </tr>
+  <tr>
+    <td colspan=7><i>There are no versions of this file availible to you</i></td>
+  </tr>
 </if>
 </table>
Index: openacs-4/packages/file-storage/www/file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/file.tcl	4 Dec 2001 04:59:48 -0000	1.5
+++ openacs-4/packages/file-storage/www/file.tcl	24 Apr 2002 20:06:25 -0000	1.6
@@ -32,6 +32,8 @@
 set user_id [ad_conn user_id]
 set context_bar [fs_context_bar_list $file_id]
 
+set show_administer_permissions_link_p [ad_parameter "ShowAdministerPermissionsLinkP"]
+
 db_1row file_info "
 select person.name(o.creation_user) as owner,
        i.name,
@@ -72,4 +74,4 @@
 
 db_multirow version version_info $sql
 
-ad_return_template
\ No newline at end of file
+ad_return_template
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.9 -r1.10
--- openacs-4/packages/file-storage/www/index.adp	2 Apr 2002 15:25:37 -0000	1.9
+++ openacs-4/packages/file-storage/www/index.adp	24 Apr 2002 20:06:25 -0000	1.10
@@ -4,17 +4,21 @@
 <property name="context_bar">@context_bar@</property>
 
 <table>
-<if @write_p@ eq 1>
+<if @write_p@ true>
   <tr>
     <td width="5%"><li></td>
-    <td><a href="file-add?folder_id=@folder_id@">Upload a file</a>&nbsp; &nbsp; | &nbsp; &nbsp; <a href="simple-add?folder_id=@folder_id@">Create a URL</a>
+    <td>
+      <a href="file-add?folder_id=@folder_id@">Upload a file</a>
+      &nbsp;&nbsp;|&nbsp;&nbsp;
+      <a href="simple-add?folder_id=@folder_id@">Create a URL</a>
+    </td>
   </tr>
   <tr>
     <td><li></td>
     <td><a href="folder-create?parent_id=@folder_id@">Create a new folder</a></td>
   </tr>
 </if>
-<if @admin_p@ eq 1>
+<if @admin_p@ true and @show_administer_permissions_link_p@ true>
   <tr><td colspan="2"><br></td></tr>
   <tr>
     <td><li></td>
@@ -25,7 +29,7 @@
     </td>
   </tr>
 </if>
-<if @delete_p@ eq 1 and @nonroot_folder_p@ ne 0 and @n_contents@ eq 0>
+<if @delete_p@ true and @nonroot_folder_p@ true and @n_contents@ eq 0>
   <tr><td colspan="2"><br></td></tr>
   <tr>
     <td><li></td>
@@ -38,9 +42,9 @@
   <tr>
     <td><li></td>
     <td>
-  <formtemplate id="n_past_days_form">
+<formtemplate id="n_past_days_form">
       Show files modified in the past <formwidget id="n_past_days"> days as new.
-  </formtemplate>
+</formtemplate>
     </td>
   </tr>
 </table>
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.11 -r1.12
--- openacs-4/packages/file-storage/www/index.tcl	2 Apr 2002 15:25:37 -0000	1.11
+++ openacs-4/packages/file-storage/www/index.tcl	24 Apr 2002 20:06:25 -0000	1.12
@@ -10,7 +10,7 @@
     {n_past_days:integer "-1"}
 } -validate {
     valid_folder -requires {folder_id:integer} {
-	if ![fs_folder_p $folder_id] {
+	if {![fs_folder_p $folder_id]} {
 	    ad_complain "The specified folder is not valid."
 	}
     }
@@ -51,6 +51,7 @@
 
 set package_id [ad_conn package_id]
 
+set show_administer_permissions_link_p [ad_parameter -package_id $package_id "ShowAdministerPermissionsLinkP"]
 set n_contents [fs::get_folder_contents_count -folder_id $folder_id -user_id $user_id]
 
 form create n_past_days_form