Index: openacs-4/packages/general-comments/www/view-comment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/general-comments/www/view-comment.tcl 20 Dec 2010 00:15:22 -0000 1.9 +++ openacs-4/packages/general-comments/www/view-comment.tcl 27 Oct 2014 16:41:44 -0000 1.10 @@ -8,8 +8,8 @@ @creation-date 2000-10-12 @cvs-id $Id$ } { - comment_id:notnull - { revision_id {} } + comment_id:naturalnum,notnull + { revision_id:naturalnum,optional {} } { object_name {} } { return_url {} } } -properties { @@ -36,14 +36,14 @@ # check for permissions set package_id [ad_conn package_id] -ad_require_permission $comment_id read -set write_perm_p [ad_permission_p $comment_id write] -set admin_p [ad_permission_p $package_id admin] +permission::require_permission -object_id $comment_id -privilege read +set write_perm_p [permission::permission_p -object_id $comment_id -privilege write] +set admin_p [permission::permission_p -object_id $package_id -privilege admin] # if the user has write permissions then allow # viewing of selected revision if { $write_perm_p == 1 } { - if { [empty_string_p $revision_id] } { + if { $revision_id eq "" } { # get the latest revision set revision_id [db_string get_latest_revision { select content_item.get_latest_revision(:comment_id) from dual @@ -93,8 +93,8 @@ set view_comment_url [export_vars -base "view-comment" {comment_id revision_id return_url}] } -set allow_file_p [ad_parameter AllowFileAttachmentsP {general-comments} {t}] -set allow_link_p [ad_parameter AllowLinkAttachmentsP {general-comments} {t}] +set allow_file_p [parameter::get -parameter AllowFileAttachmentsP -default {t}] +set allow_link_p [parameter::get -parameter AllowLinkAttachmentsP -default {t}] set allow_attach_p "t" if { $allow_file_p == "f" && $allow_link_p == "f" } { set allow_attach_p "f"