Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v diff -u -r1.18 -r1.19 --- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl 10 Jan 2007 21:22:11 -0000 1.18 +++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl 23 Dec 2008 12:23:00 -0000 1.19 @@ -27,7 +27,8 @@ ad_proc -public ad_approval_system_inuse_p {} { Returns 1 if the system is configured to use and approval system. } { - if {[ad_parameter RegistrationRequiresEmailVerification] && [ad_parameter RegistrationRequiresApprovalP] } { + if {[parameter::get -parameter RegistrationRequiresEmailVerification] && + [parameter::get -parameter RegistrationRequiresApprovalP] } { return 1 } else { return 0 @@ -89,7 +90,7 @@ lappend clauses "have an email address starting with $email_starts_with" } "expensive" { - lappend clauses "have accumulated unpaid charges of more than [ad_parameter ExpensiveThreshold "member-value"]" + lappend clauses "have accumulated unpaid charges of more than [parameter::get -parameter ExpensiveThreshold]" } "user_state" { lappend clauses "have user state of $user_state" @@ -273,7 +274,7 @@ } "expensive" { if { [info exists count_only_p] && $count_only_p } { - lappend where_clauses "[ad_parameter ExpensiveThreshold "member-value"] < (select sum(amount) from users_charges where users_charges.user_id = users.user_id)" + lappend where_clauses "[parameter::get -parameter ExpensiveThreshold] < (select sum(amount) from users_charges where users_charges.user_id = users.user_id)" } else { if {[lsearch $tables "user_charges"] == -1 } { lappend tables "users_charges" @@ -282,7 +283,7 @@ set group_clauses [concat $group_clauses $user_columns] - lappend having_clauses "sum(users_charges.amount) > [ad_parameter ExpensiveThreshold "member-value"]" + lappend having_clauses "sum(users_charges.amount) > [parameter::get -parameter ExpensiveThreshold]" # only the ones where they haven't paid lappend where_clauses "users_charges.order_id is null" }