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.32 -r1.33 --- openacs-4/packages/file-storage/www/file.tcl 3 Oct 2011 10:01:24 -0000 1.32 +++ openacs-4/packages/file-storage/www/file.tcl 27 Oct 2014 16:41:32 -0000 1.33 @@ -5,11 +5,11 @@ @creation-date 7 Nov 2000 @cvs-id $Id$ } { - file_id:integer,notnull + file_id:naturalnum,notnull {show_all_versions_p "f"} } -validate { valid_file -requires {file_id} { - if ![fs_file_p $file_id] { + if {![fs_file_p $file_id]} { ad_complain "[_ file-storage.lt_The_specified_file_is]" } } @@ -32,7 +32,7 @@ set user_id [ad_conn user_id] set context [fs_context_bar_list $file_id] -set show_administer_permissions_link_p [ad_parameter "ShowAdministerPermissionsLinkP"] +set show_administer_permissions_link_p [parameter::get -parameter "ShowAdministerPermissionsLinkP"] set root_folder_id [fs::get_root_folder] db_1row file_info "" @@ -66,7 +66,7 @@ "[_ file-storage.Move_File]" [export_vars -base move {{object_id $file_id} {return_url $folder_view_url}}] "Move file" \ "[_ file-storage.Delete_File]" [export_vars -base delete {{object_id $file_id} {return_url $folder_view_url}}] "Delete file"] -if {[string equal $delete_p "t"]} { +if {$delete_p == "t"} { lappend actions [_ file-storage.Set_Permissions] [export_vars -base permissions {{object_id $file_id}}] [_ file-storage.lt_Modify_permissions_on] } @@ -110,12 +110,12 @@ if {$content_size < 1024} { set content_size_pretty "[lc_numeric $content_size] [_ file-storage.bytes]" } else { - set content_size_pretty "[lc_numeric [expr $content_size / 1024 ]] [_ file-storage.kb]" + set content_size_pretty "[lc_numeric [expr {$content_size / 1024 }]] [_ file-storage.kb]" } - if {[string equal $title ""]} { + if {$title eq ""} { set title "[_ file-storage.untitled]" } - if {![string equal $version_id $live_revision]} { + if {$version_id ne $live_revision } { set version_url [export_vars -base "download/$title" {version_id}] } else { set version_url [export_vars -base "download/$title" {file_id}]