Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v diff -u -r1.57 -r1.58 --- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 21 Nov 2007 14:08:44 -0000 1.57 +++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 21 Dec 2008 17:34:25 -0000 1.58 @@ -43,28 +43,28 @@ @return The e-mail address of a technical person who can fix problems } { - return [ad_parameter -package_id [ad_acs_kernel_id] HostAdministrator] + return [parameter::get -package_id [ad_acs_kernel_id] -parameter HostAdministrator] } ad_proc -public ad_outgoing_sender {} { @return The email address that will sign outgoing alerts } { - return [ad_parameter -package_id [ad_acs_kernel_id] OutgoingSender] + return [parameter::get -package_id [ad_acs_kernel_id] -parameter OutgoingSender] } ad_proc -public ad_system_name {} { This is the main name of the Web service that you're offering on top of the OpenACS Web Publishing System. } { - return [ad_parameter -package_id [ad_acs_kernel_id] SystemName] + return [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemName] } ad_proc -public ad_pvt_home {} { This is the URL of a user's private workspace on the system, usually [subsite]/pvt/home.tcl } { - return "[subsite::get_element -element url -notrailing][ad_parameter -package_id [ad_acs_kernel_id] HomeURL]" + return "[subsite::get_element -element url -notrailing][parameter::get -package_id [ad_acs_kernel_id] -parameter HomeURL]" } ad_proc -public ad_admin_home {} { @@ -85,7 +85,7 @@ This is the name that will be used for the user's workspace (usually "Your Workspace"). @return the name especified for the user's workspace in the HomeName kernel parameter. } { - return [lang::util::localize [ad_parameter -package_id [ad_acs_kernel_id] HomeName]] + return [lang::util::localize [parameter::get -package_id [ad_acs_kernel_id] -parameter HomeName]] } ad_proc -public ad_pvt_home_link {} { @@ -109,29 +109,29 @@ Person who owns the service this person would be interested in user feedback, etc. } { - return [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner] + return [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemOwner] } ad_proc -public ad_publisher_name {} { A human-readable name of the publisher, suitable for legal blather. } { - return [ad_parameter -package_id [ad_acs_kernel_id] PublisherName] + return [parameter::get -package_id [ad_acs_kernel_id] -parameter PublisherName] } ad_proc -public ad_url {} { This will be called by email alerts. Do not use ad_conn location @return the system url as defined in the kernel parameter SystemURL. } { - return [ad_parameter -package_id [ad_acs_kernel_id] SystemURL] + return [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL] } ad_proc -public acs_community_member_page {} { @return the url for the community member page } { - return "[subsite::get_element -element url -notrailing][ad_parameter \ - -package_id [ad_acs_kernel_id] CommunityMemberURL]" + return "[subsite::get_element -element url -notrailing][parameter::get \ + -package_id [ad_acs_kernel_id] -parameter CommunityMemberURL]" } ad_proc -public acs_community_member_url { @@ -256,8 +256,8 @@ array set attrs [list] - set attrs(bgcolor) [ad_parameter -package_id [ad_acs_kernel_id] bgcolor "" "white"] - set attrs(text) [ad_parameter -package_id [ad_acs_kernel_id] textcolor "" "black"] + set attrs(bgcolor) [parameter::get -package_id [ad_acs_kernel_id] -parameter bgcolor -default "white"] + set attrs(text) [parameter::get -package_id [ad_acs_kernel_id] -parameter textcolor -default "black"] if { $focus ne "" } { set attrs(onLoad) "javascript:document.${focus}.focus()" @@ -294,7 +294,7 @@ } else { set extra_br "" } - if { [ad_parameter -package_id [ad_acs_kernel_id] EnabledP curriculum 0] && [ad_parameter -package_id [ad_acs_kernel_id] StickInFooterP curriculum 0] && !$suppress_curriculum_bar_p} { + if { [parameter::get -package_id [ad_acs_kernel_id] -parameter EnabledP -default 0] && [parameter::get -package_id [ad_acs_kernel_id] -parameter StickInFooterP -default 0] && !$suppress_curriculum_bar_p} { set curriculum_bar "
[curriculum_bar]
" } else { set curriculum_bar "" @@ -325,7 +325,7 @@ ad_proc -public ad_admin_owner {} { @return E-mail address of the Administrator of this site. } { - return [ad_parameter -package_id [ad_acs_kernel_id] AdminOwner] + return [parameter::get -package_id [ad_acs_kernel_id] -parameter AdminOwner] } ad_proc -deprecated ad_admin_header { @@ -745,7 +745,7 @@ Returns multiple values for a parameter as a list. } { - return [join [ad_parameter -package_id $package_id $name $subsection] " "] + return [join [parameter::get -package_id $package_id -parameter $name ] " "] } ad_proc doc_return {args} { Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v diff -u -r1.96 -r1.97 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 25 Nov 2008 17:08:50 -0000 1.96 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 21 Dec 2008 17:34:25 -0000 1.97 @@ -577,7 +577,7 @@ set acs_kernel_id [util_memoize ad_acs_kernel_id] if { $root eq "" - && [ad_parameter -package_id $acs_kernel_id ForceHostP request-processor 0] } { + && [parameter::get -package_id $acs_kernel_id -parameter ForceHostP -default 0] } { set host_header [ns_set iget [ns_conn headers] "Host"] regexp {^([^:]*)} $host_header "" host_no_port regexp {^https?://([^:]+)} [ns_conn location] "" desired_host_no_port @@ -711,12 +711,12 @@ timestamp. } { - if { [ad_parameter -package_id [ad_acs_kernel_id] DebugP request-processor 0] } { + if { [parameter::get -package_id [ad_acs_kernel_id] -parameter DebugP -default 0] } { global ad_conn set clicks [clock clicks -milliseconds] ds_add rp [list debug $string $clicks $clicks] } - if { [ad_parameter -package_id [ad_acs_kernel_id] LogDebugP request-processor 0] + if { [parameter::get -package_id [ad_acs_kernel_id] -parameter LogDebugP -default 0] || $debug eq "t" || $debug eq "1" } { @@ -762,7 +762,7 @@ #Serve the stacktrace set params [list [list stacktrace $message] [list user_id $user_id] [list error_file $error_file] [list prev_url $prev_url] [list feedback_id $feedback_id] [list error_url $error_url] [list bug_package_id $bug_package_id] [list vars_to_export $vars_to_export]] - if {![ad_parameter -package_id [ad_acs_kernel_id] "RestrictErrorsToAdminsP" dummy 0] || \ + if {![parameter::get -package_id [ad_acs_kernel_id] -parameter RestrictErrorsToAdminsP -default 0] || \ [permission::permission_p -object_id [ad_conn package_id] -privilege admin] } { } @@ -1069,7 +1069,7 @@ set files [glob -nocomplain "$path_glob$extension_pattern"] # Search for files in the order specified in ExtensionPrecedence. - set precedence [ad_parameter -package_id [ad_acs_kernel_id] "ExtensionPrecedence" "request-processor" "tcl"] + set precedence [parameter::get -package_id [ad_acs_kernel_id] -parameter ExtensionPrecedence -default tcl] foreach extension [split [string trim $precedence] ","] { if { [lsearch -glob $files "*.$extension"] != -1 } { return "$path.$extension" Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v diff -u -r1.43 -r1.44 --- openacs-4/packages/acs-templating/tcl/parse-procs.tcl 2 Oct 2007 19:13:31 -0000 1.43 +++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl 21 Dec 2008 17:28:52 -0000 1.44 @@ -385,8 +385,7 @@ set proc_name [info procs ::template::mtimes::${type}::$file_stub] set pkg_id [apm_package_id_from_key acs-templating] - set refresh_cache [ad_parameter -package_id $pkg_id RefreshCache dummy\ - "as needed"] + set refresh_cache [parameter::get -package_id $pkg_id -parameter RefreshCache -default "as needed"] if {$proc_name eq {} || $refresh_cache ne "never" } { set mtime [file mtime $file_stub.$type] Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v diff -u -r1.32 -r1.33 --- openacs-4/packages/acs-templating/tcl/tag-init.tcl 8 Sep 2008 18:48:57 -0000 1.32 +++ openacs-4/packages/acs-templating/tcl/tag-init.tcl 21 Dec 2008 17:28:52 -0000 1.33 @@ -60,8 +60,8 @@ # default to the site-wide master if {$src eq ""} { - set src "\[ad_parameter -package_id \[ad_conn subsite_id\]\ - DefaultMaster dummy \"/www/default-master\"\]" + set src "\[parameter::get -package_id \[ad_conn subsite_id\]\ + -parameter DefaultMaster -default \"/www/default-master\"\]" } template::adp_append_code " Index: openacs-4/packages/acs-templating/tcl/template-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/template-init.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/tcl/template-init.tcl 9 Mar 2002 02:00:02 -0000 1.2 +++ openacs-4/packages/acs-templating/tcl/template-init.tcl 21 Dec 2008 17:28:52 -0000 1.3 @@ -12,11 +12,11 @@ set pkg_id [apm_package_id_from_key acs-templating] -if { [ad_parameter -package_id $pkg_id ShowCompiledTemplatesP dummy 0] } { +if { [parameter::get -package_id $pkg_id -parameter ShowCompiledTemplatesP -default 0] } { ad_register_filter postauth GET *.cmp cmp_page_filter } -if { [ad_parameter -package_id $pkg_id ShowDataDictionariesP dummy 0] } { +if { [parameter::get -package_id $pkg_id -parameter ShowDataDictionariesP -default 0] } { ad_register_filter postauth GET *.dat dat_page_filter ad_register_filter postauth GET *.frm frm_page_filter }