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.30 -r1.31
--- openacs-4/packages/file-storage/www/index.tcl	15 Jun 2007 17:40:29 -0000	1.30
+++ openacs-4/packages/file-storage/www/index.tcl	27 Oct 2014 16:41:33 -0000	1.31
@@ -6,10 +6,10 @@
     @creation-date 6 Nov 2000
     @cvs-id $Id$
 } {
-    {folder_id:integer [fs_get_root_folder]}
+    {folder_id:naturalnum,notnull [fs_get_root_folder]}
     {n_past_days:integer "99999"}
     {orderby:optional}
-    {category_id:integer ""}
+    {category_id:naturalnum ""}
     {return_url ""}
 } -validate {
     valid_folder -requires {folder_id:integer} {
@@ -44,8 +44,8 @@
     -object_id $folder_id \
     -privilege "read"
 
-set write_p [ad_permission_p $folder_id write]
-set admin_p [ad_permission_p $folder_id admin]
+set write_p [permission::permission_p -object_id $folder_id -privilege write]
+set admin_p [permission::permission_p -object_id $folder_id -privilege admin]
 
 # might want a more complicated check here, since a person might have
 # delete permission on the folder, but not on some child items and,
@@ -54,12 +54,12 @@
 
 set delete_p $admin_p
 if {!$delete_p} {
-    set delete_p [ad_permission_p $folder_id delete]
+    set delete_p [permission::permission_p -object_id $folder_id -privilege delete]
 }
 
 set package_id [ad_conn package_id]
 
-set show_administer_permissions_link_p [ad_parameter -package_id $package_id "ShowAdministerPermissionsLinkP"]
+set show_administer_permissions_link_p [parameter::get -package_id $package_id -parameter "ShowAdministerPermissionsLinkP" -default 1]
 set n_contents [fs::get_folder_contents_count -folder_id $folder_id -user_id $user_id]
 
 form create n_past_days_form
@@ -98,15 +98,15 @@
 # For now I leave it in as it is.
 
 set project_item_id [application_data_link::get_linked -from_object_id $folder_id -to_object_type "content_item"]
-if {[exists_and_not_null project_item_id]} {
+if {([info exists project_item_id] && $project_item_id ne "")} {
     set project_url [pm::project::url -project_item_id $project_item_id]
     set project_name [pm::project::name -project_item_id $project_item_id]
 } else {
 
     # The folder itself was not linked. Let's try the parent folder.
     set parent_folder [content::item::get_parent_folder -item_id $folder_id]
     set project_item_id [application_data_link::get_linked -from_object_id $parent_folder -to_object_type "content_item"]
-    if {[exists_and_not_null project_item_id]} {
+    if {([info exists project_item_id] && $project_item_id ne "")} {
 	set project_url [pm::project::url -project_item_id $project_item_id]
 	set project_name [pm::project::name -project_item_id $project_item_id]
     } else {
@@ -117,7 +117,7 @@
 }
 
 # 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"]} {
+if {$project_item_id ne "" && ![permission::permission_p -object_id $project_item_id -privilege "read"]} {
     set project_url {}
 }
 
@@ -127,13 +127,13 @@
 	set up_url [ad_conn package_url]
 	set up_name [ad_conn instance_name]
     } else {
-	set up_url [lindex [lindex $context end-1] 0]
-	set up_name [lindex [lindex $context end-1] 1]
+	set up_url [lindex $context end-1 0]
+	set up_name [lindex $context end-1 1]
     }
     set up_name [lang::util::localize $up_name]
 }
 
-set use_webdav_p  [ad_parameter "UseWebDavP"]
+set use_webdav_p  [parameter::get -parameter "UseWebDavP"]
 
 if { $use_webdav_p == 1} { 
     set webdav_url [fs::webdav_url -item_id $folder_id]