Index: openacs-4/packages/acs-subsite/lib/home.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/home.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/lib/home.tcl 29 Aug 2007 13:44:37 -0000 1.1 +++ openacs-4/packages/acs-subsite/lib/home.tcl 6 Jan 2009 02:25:34 -0000 1.2 @@ -53,7 +53,7 @@ -if {[ad_parameter SolicitPortraitP "user-info" 0]} { +if {[parameter::get -parameter SolicitPortraitP -default 0]} { # we have portraits for some users if {![db_0or1row get_portrait_info " select cr.publish_date, nvl(cr.title,'your portrait') as portrait_title, Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl 2 Jul 2003 17:57:31 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl 6 Jan 2009 02:25:34 -0000 1.5 @@ -19,7 +19,7 @@ if { [catch { db_foreach apm_parameters_set {} { if {[info exists params($parameter_id)]} { - ad_parameter -set $params($parameter_id) -package_id $package_id $parameter_name $package_key + parameter::set_value -value $params($parameter_id) -package_id $package_id -parameter $parameter_name } } } errmsg] } { Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-subsite/www/admin/users/new.tcl 10 Jan 2007 21:22:08 -0000 1.9 +++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl 6 Jan 2009 02:25:34 -0000 1.10 @@ -135,7 +135,7 @@ # Get whether they requre some sort of approval -if {[ad_parameter RegistrationRequiresApprovalP "security" 0]} { +if {[parameter::get -parameter RegistrationRequiresApprovalP -default 0]} { set member_state "" } else { set member_state "approved" @@ -154,7 +154,7 @@ set add_to_group_id [application_group::group_id_from_package_id] } - if {[ad_parameter RegistrationRequiresEmailVerificationP "security" 0]} { + if {[parameter::get -parameter RegistrationRequiresEmailVerificationP -default 0]} { set email_verified_p "f" } else { set email_verified_p "t" @@ -219,9 +219,9 @@ if {!$double_click_p} { - set notification_address [ad_parameter NewRegistrationEmailAddress "security" [ad_system_owner]] + set notification_address [parameter::get -parameter NewRegistrationEmailAddress -default [ad_system_owner]] - if {[ad_parameter NotifyAdminOfNewRegistrationsP "security" 0]} { + if {[parameter::get -parameter NotifyAdminOfNewRegistrationsP -default 0]} { set creation_user [ad_conn user_id] set creation_name [db_string creation_name_query { @@ -250,7 +250,7 @@ ns_sendmail [template::element::get_value add_user email] \ $notification_address \ "Welcome to [ad_system_name]" \ - "To confirm your registration, please go to [ad_parameter -package_id [ad_acs_kernel_id] SystemURL]/register/email-confirm?[export_url_vars row_id] + "To confirm your registration, please go to [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL]/register/email-confirm?[export_url_vars row_id] After confirming your email, here's how you can log in at [ad_url]: Index: openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl 1 Mar 2005 00:01:23 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl 6 Jan 2009 02:25:34 -0000 1.4 @@ -20,6 +20,6 @@ set context [list [list "./" "Users"] "Notify added user"] set system_name [ad_system_name] set export_vars [export_form_vars email first_names last_name user_id] -set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""]. +set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""]. ad_return_template Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/acs-subsite/www/shared/community-member.tcl 10 Jan 2007 21:22:10 -0000 1.14 +++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl 6 Jan 2009 02:25:34 -0000 1.15 @@ -28,7 +28,7 @@ set subsite_url [subsite::get_element -element url] #See if this page has been overrided by a parameter in kernel -set community_member_url [ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberURL "/shared/community-member"] +set community_member_url [parameter::get -package_id [ad_acs_kernel_id] -parameter CommunityMemberURL -default "/shared/community-member"] if { $community_member_url ne "/shared/community-member" } { ad_returnredirect "$community_member_url?user_id=$user_id" ad_script_abort Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 22 Mar 2008 18:16:11 -0000 1.12 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 6 Jan 2009 02:25:34 -0000 1.13 @@ -77,8 +77,8 @@ } } -set mime_types [ad_parameter AcceptablePortraitMIMETypes "user-info"] -set max_bytes [ad_parameter MaxPortraitBytes "user-info"] +set mime_types [parameter::get -parameter AcceptablePortraitMIMETypes -default ""] +set max_bytes [parameter::get -parameter MaxPortraitBytes -default ""] ad_form -extend -name "portrait_upload" -validate {