Index: openacs-4/packages/acs-admin/lib/become.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/become.tcl,v
diff -u -r1.3.12.1 -r1.3.12.2
--- openacs-4/packages/acs-admin/lib/become.tcl	10 Sep 2015 08:21:00 -0000	1.3.12.1
+++ openacs-4/packages/acs-admin/lib/become.tcl	2 Jan 2016 21:14:09 -0000	1.3.12.2
@@ -14,7 +14,7 @@
 
 # Get the password and user ID
 
-if {![db_0or1row password "select password from users where user_id=$user_id"]} {
+if {![db_0or1row password {select password from users where user_id = :user_id}]} {
     ad_return_error "Couldn't find user $user_id" "Couldn't find user $user_id."
     return
 }
Index: openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl	10 Sep 2015 08:21:03 -0000	1.11.2.1
+++ openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl	2 Jan 2016 21:14:09 -0000	1.11.2.2
@@ -10,7 +10,11 @@
     {type ""}
 }
 
-db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id"
+db_1row package_version_info {
+    select pretty_name, version_name
+    from apm_package_version_info
+    where version_id = :version_id
+}
 
 set return_url [export_vars -base version-callbacks { version_id }]
 
Index: openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl	10 Sep 2015 08:21:03 -0000	1.5.2.2
+++ openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl	2 Jan 2016 21:14:09 -0000	1.5.2.3
@@ -9,7 +9,11 @@
     type:notnull
 }
 
-db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id"
+db_1row package_version_info {
+    select pretty_name, version_name
+    from apm_package_version_info
+    where version_id = :version_id
+}
 
 set return_url [export_vars -base version-callbacks { version_id }]
 
Index: openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl	10 Sep 2015 08:21:03 -0000	1.8.2.1
+++ openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl	2 Jan 2016 21:14:09 -0000	1.8.2.2
@@ -7,10 +7,16 @@
     version_id:naturalnum,notnull    
 }
 
-db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id"
+db_1row package_version_info {
+    select pretty_name, version_name
+    from apm_package_version_info
+    where version_id = :version_id
+}
 
 set page_title "\#acs-admin.Tcl_Callbacks\#"
-set context [list [list "." "\#acs-admin.Package_Manager\#"] [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] $page_title]
+set context [list [list "." "\#acs-admin.Package_Manager\#"] \
+                 [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] \
+                 $page_title]
 
 set unused_callback_types [apm_unused_callback_types -version_id $version_id]
 
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl	10 Sep 2015 08:21:05 -0000	1.5.2.1
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl	2 Jan 2016 21:14:10 -0000	1.5.2.2
@@ -11,7 +11,11 @@
     {file_action:multiple}
 }
 
-db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id"
+db_1row package_version_info {
+    select pretty_name, version_name
+    from apm_package_version_info
+    where version_id = :version_id
+}
 
 set page_title "Internationalization of $pretty_name $version_name"
 set context_bar [ad_context_bar $page_title]
Index: openacs-4/packages/acs-admin/www/apm/version-i18n.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n.tcl,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/acs-admin/www/apm/version-i18n.tcl	10 Sep 2015 08:21:05 -0000	1.14.2.1
+++ openacs-4/packages/acs-admin/www/apm/version-i18n.tcl	2 Jan 2016 21:14:10 -0000	1.14.2.2
@@ -13,7 +13,11 @@
     {file_type adp}
 }
 
-db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id"
+db_1row package_version_info {
+    select pretty_name, version_name
+    from apm_package_version_info
+    where version_id = :version_id
+}
 
 set page_title "Message catalog lookups for adp and tcl files of $pretty_name $version_name"
 set context_bar [ad_context_bar $page_title]
Index: openacs-4/packages/acs-admin/www/users/complex-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.tcl,v
diff -u -r1.15.2.2 -r1.15.2.3
--- openacs-4/packages/acs-admin/www/users/complex-search.tcl	10 Sep 2015 11:23:49 -0000	1.15.2.2
+++ openacs-4/packages/acs-admin/www/users/complex-search.tcl	2 Jan 2016 21:14:10 -0000	1.15.2.3
@@ -103,8 +103,11 @@
 
 if {$limit_to_users_in_group_id ne "" 
     && ![regexp {[^-0-9]} $limit_to_users_in_group_id] } {
-    set group_name [db_string user_group_name_from_id \
-                        "select group_name from groups where group_id = :limit_to_users_in_group_id"]
+    set group_name [db_string user_group_name_from_id {
+        select group_name
+        from groups
+        where group_id = :limit_to_users_in_group_id
+    }]
     incr rowcount
     set criteria:[set rowcount](data) \
         "Is a member of '$group_name'"
@@ -194,16 +197,18 @@
 
 
 if { $limit_to_users_in_group_id ne "" } {
-    set query "select distinct first_names, last_name, email, member_state, email_verified_p, cu.user_id
+    set query {
+        select distinct first_names, last_name, email, member_state, email_verified_p, cu.user_id
         from cc_users cu, group_member_map gm
         where (cu.user_id = gm.member_id
-        and gm.group_id = :limit_to_users_in_group_id)"
+               and gm.group_id = :limit_to_users_in_group_id)
+    }
     if {[llength $where_clause] > 0} {
         append query \
             "\n$where_conjunction [join $where_clause "\n$where_conjunction "]"
     }
 } else {
-    set query "select user_id, email_verified_p, first_names, last_name, email, member_state from cc_users"
+    set query {select user_id, email_verified_p, first_names, last_name, email, member_state from cc_users}
     if {[llength $where_clause] > 0} {
         append query "\nwhere [join $where_clause "\n$where_conjunction "]"
     }
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	10 Sep 2015 08:21:09 -0000	1.17.2.1
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	2 Jan 2016 21:14:10 -0000	1.17.2.2
@@ -70,12 +70,10 @@
 
     switch $email_verified_p {
         "t" {
-            db_exec_plsql approve_email "
-                begin acs_user.approve_email ( user_id => :user_id ); end;"
+            db_exec_plsql approve_email {}
         }
         "f" {
-            db_exec_plsql unapprove_email "
-                begin acs_user.unapprove_email ( user_id => :user_id ); end;"
+            db_exec_plsql unapprove_email {}
         }
     }
 } errmsg]} {
@@ -86,8 +84,8 @@
 callback acs_admin::member_state_change -member_state $member_state -user_id $user_id
 
 set admin_user_id [ad_conn user_id]
-set email_from [db_string admin_email "select email from parties where party_id = :admin_user_id"]
-set subject "$action"
+set email_from [db_string admin_email {select email from parties where party_id = :admin_user_id}]
+set subject $action
 set message $email_message
 
 if {$return_url eq ""} {
Index: openacs-4/packages/acs-admin/www/users/merge-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-confirm.tcl,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-admin/www/users/merge-confirm.tcl	2 Jan 2016 13:50:16 -0000	1.4.2.2
+++ openacs-4/packages/acs-admin/www/users/merge-confirm.tcl	2 Jan 2016 21:14:10 -0000	1.4.2.3
@@ -12,8 +12,8 @@
     context:onevalue
 } -validate {
     if_diff_authority {
-	set from_authority_id [db_string gettoa "select authority_id from cc_users where user_id = :from_user_id"]
-	set to_authority_id [db_string getfroma "select authority_id from cc_users where user_id = :to_user_id"]
+	set from_authority_id [db_string gettoa {select authority_id from cc_users where user_id = :from_user_id}]
+	set to_authority_id [db_string getfroma {select authority_id from cc_users where user_id = :to_user_id}]
 	if { $from_authority_id ne $to_authority_id } {
 	    ad_complain "Merge only works for users from the same authority"
 	}
Index: openacs-4/packages/acs-admin/www/users/merge-final.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-admin/www/users/merge-final.tcl	10 Sep 2015 08:21:09 -0000	1.6.2.1
+++ openacs-4/packages/acs-admin/www/users/merge-final.tcl	2 Jan 2016 21:14:10 -0000	1.6.2.2
@@ -12,8 +12,8 @@
     context:onevalue
 } -validate {
     if_diff_authority {
-	set from_authority_id [db_string gettoa "select authority_id from cc_users where user_id = :from_user_id"]
-	set to_authority_id [db_string getfroma "select authority_id from cc_users where user_id = :to_user_id"]
+	set from_authority_id [db_string gettoa {select authority_id from cc_users where user_id = :from_user_id}]
+	set to_authority_id [db_string getfroma {select authority_id from cc_users where user_id = :to_user_id}]
 	if { $from_authority_id ne $to_authority_id } {
 	    ad_complain "Merge only works for users of the same authority"
 	} 
@@ -32,8 +32,9 @@
 if { !$merge_p } {
     ad_returnredirect "/acs-admin/users"
 } else {
-    set final_results [callback merge::MergePackageUser -from_user_id $from_user_id -to_user_id $to_user_id]
-
+    set final_results [callback merge::MergePackageUser \
+                           -from_user_id $from_user_id \
+                           -to_user_id $to_user_id]
     set results "<ul>"
     foreach item $final_results {
 	append results "<li>[lindex $item 0]<ul>"
@@ -46,7 +47,9 @@
 
     merge::MergeUserInfo -from_user_id $from_user_id -to_user_id $to_user_id
 
-    set impl_id [auth::authority::get_element -authority_id $to_authority_id -element "auth_impl_id"]
+    set impl_id [auth::authority::get_element \
+                     -authority_id $to_authority_id \
+                     -element "auth_impl_id"]
     set parameters [list $from_user_id $to_user_id $to_authority_id]
     set user_res [acs_sc::invoke \
 		      -error \
Index: openacs-4/packages/acs-admin/www/users/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.tcl,v
diff -u -r1.17.2.3 -r1.17.2.4
--- openacs-4/packages/acs-admin/www/users/one.tcl	2 Jan 2016 13:50:17 -0000	1.17.2.3
+++ openacs-4/packages/acs-admin/www/users/one.tcl	2 Jan 2016 21:14:10 -0000	1.17.2.4
@@ -56,11 +56,7 @@
 
 # XXX Make sure to make the following into links and this looks okay
 
-db_multirow user_contributions  user_contributions "select at.pretty_name, at.pretty_plural, a.creation_date, acs_object.name(a.object_id) object_name
-from acs_objects a, acs_object_types at
-where a.object_type = at.object_type
-and a.creation_user = :user_id
-order by object_name, creation_date"
+db_multirow user_contributions user_contributions {}
 
 # cro@ncacasi.org 2002-02-20 
 # Boy is this query wacked, but I think I am starting to understand
Index: openacs-4/packages/acs-admin/www/users/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.tcl,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/acs-admin/www/users/search.tcl	10 Sep 2015 08:21:10 -0000	1.9.2.1
+++ openacs-4/packages/acs-admin/www/users/search.tcl	2 Jan 2016 21:14:10 -0000	1.9.2.2
@@ -110,17 +110,21 @@
 }
 
 if { $limit_to_users_in_group_id ne "" } {
-set query "select distinct first_names, last_name, email, member_state, email_verified_p, cu.user_id
-from cc_users cu, group_member_map gm, membership_rels mr
-where cu.user_id = gm.member_id
-  and gm.rel_id = mr.rel_id
-  and gm.group_id = :limit_to_users_in_group_id
-  and [join $where_clause "\nand "]"
+    set query [subst {
+        select distinct first_names, last_name, email, member_state, email_verified_p, cu.user_id
+        from cc_users cu, group_member_map gm, membership_rels mr
+        where cu.user_id = gm.member_id
+        and gm.rel_id = mr.rel_id
+        and gm.group_id = :limit_to_users_in_group_id
+        and [join $where_clause "\nand "]
+    }]
 
 } else {
-set query "select user_id, email_verified_p, first_names, last_name, email, member_state
-from cc_users
-where [join $where_clause "\nand "]"
+    set query [subst {
+        select user_id, email_verified_p, first_names, last_name, email, member_state
+        from cc_users
+        where [join $where_clause "\nand "]
+    }]
 }
 
 
@@ -163,8 +167,11 @@
 # We are limiting the search to one group - display that group's name
 if { $limit_to_users_in_group_id ne "" 
      && ![regexp {[^0-9]} $limit_to_users_in_group_id] } {
-    set group_name [db_string user_group_name_from_id \
-			"select group_name from user_groups where group_id = :limit_to_users_in_group_id"]
+    set group_name [db_string user_group_name_from_id {
+        select group_name from
+        user_groups
+        where group_id = :limit_to_users_in_group_id
+    }]
     set title "User search in $group_name"
 } else {
     set group_name ""
Index: openacs-4/packages/acs-admin/www/users/session-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/session-history.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-admin/www/users/session-history.tcl	10 Sep 2015 08:21:10 -0000	1.4.2.1
+++ openacs-4/packages/acs-admin/www/users/session-history.tcl	2 Jan 2016 21:14:10 -0000	1.4.2.2
@@ -22,10 +22,16 @@
 # we have to query for pretty month and year separately because Oracle pads
 # month with spaces that we need to trim
 
-set selection [ns_db select $db "select to_char(entry_date,'YYYYMM') as sort_key, rtrim(to_char(entry_date,'Month')) as pretty_month, to_char(entry_date,'YYYY') as pretty_year, sum(session_count) as total_sessions, sum(repeat_count) as total_repeats
-from session_statistics
-group by to_char(entry_date,'YYYYMM'), to_char(entry_date,'Month'), to_char(entry_date,'YYYY')
-order by 1"]
+set selection [ns_db select $db {
+    select to_char(entry_date,'YYYYMM') as sort_key,
+       rtrim(to_char(entry_date,'Month')) as pretty_month,
+       to_char(entry_date,'YYYY') as pretty_year,
+       sum(session_count) as total_sessions,
+       sum(repeat_count) as total_repeats
+    from session_statistics
+    group by to_char(entry_date,'YYYYMM'), to_char(entry_date,'Month'), to_char(entry_date,'YYYY')
+    order by 1
+}]
 
 set last_year ""
 while { [ns_db getrow $db $selection] } {
Index: openacs-4/packages/acs-admin/www/users/sessions-one-month.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/sessions-one-month.tcl,v
diff -u -r1.3.28.1 -r1.3.28.2
--- openacs-4/packages/acs-admin/www/users/sessions-one-month.tcl	10 Sep 2015 08:21:10 -0000	1.3.28.1
+++ openacs-4/packages/acs-admin/www/users/sessions-one-month.tcl	2 Jan 2016 21:14:10 -0000	1.3.28.2
@@ -23,15 +23,13 @@
 "
 
 
-set selection [ns_db select $db "select 
-  entry_date, 
-  to_char(entry_date,'fmDD') as day_number,
-  session_count, 
-  repeat_count
-from session_statistics
-where rtrim(to_char(entry_date,'Month')) = '$QQpretty_month'
-and to_char(entry_date,'YYYY') = '$QQpretty_year'
-order by entry_date"]
+set selection [ns_db select $db {
+    select entry_date, to_char(entry_date,'fmDD') as day_number, session_count, repeat_count
+    from session_statistics
+    where rtrim(to_char(entry_date,'Month')) = '$QQpretty_month'
+    and to_char(entry_date,'YYYY') = '$QQpretty_year'
+    order by entry_date
+}]
 
 while { [ns_db getrow $db $selection] } {
     set_variables_after_query
Index: openacs-4/packages/acs-admin/www/users/sessions-registered-summary.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/sessions-registered-summary.tcl,v
diff -u -r1.2.28.1 -r1.2.28.2
--- openacs-4/packages/acs-admin/www/users/sessions-registered-summary.tcl	10 Sep 2015 08:21:10 -0000	1.2.28.1
+++ openacs-4/packages/acs-admin/www/users/sessions-registered-summary.tcl	2 Jan 2016 21:14:10 -0000	1.2.28.2
@@ -33,11 +33,13 @@
 # we have to query for pretty month and year separately because Oracle pads
 # month with spaces that we need to trim
 
-set selection [ns_db select $db "select round(sysdate-last_visit) as n_days, count(*) as n_sessions, count(second_to_last_visit) as n_repeats
-from users
-where last_visit is not null
-group by round(sysdate-last_visit)
-order by 1"]
+set selection [ns_db select $db {
+    select round(sysdate-last_visit) as n_days, count(*) as n_sessions, count(second_to_last_visit) as n_repeats
+    from users
+    where last_visit is not null
+    group by round(sysdate-last_visit)
+    order by 1
+}]
 
 set table_rows ""
 
Index: openacs-4/packages/acs-admin/www/users/user-batch-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add-2.tcl,v
diff -u -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/acs-admin/www/users/user-batch-add-2.tcl	18 Sep 2015 07:39:04 -0000	1.7.2.2
+++ openacs-4/packages/acs-admin/www/users/user-batch-add-2.tcl	2 Jan 2016 21:14:10 -0000	1.7.2.3
@@ -35,8 +35,11 @@
 	append exception_text "<li>Couldn't find a valid email address in ($row).</li>\n"
 	continue
     } else {
-	set email_count [db_string unused "select count(email)
-from parties where email = lower(:email)"]
+	set email_count [db_string unused {
+            select count(email)
+            from parties
+            where email = lower(:email)
+        }]
 	
 	if {$email_count > 0} {
 	    append exception_text "<li> $email was already in the database.</li>\n"
Index: openacs-4/packages/acs-admin/www/users/user-batch-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-admin/www/users/user-batch-add.tcl	10 Sep 2015 08:21:11 -0000	1.6.2.1
+++ openacs-4/packages/acs-admin/www/users/user-batch-add.tcl	2 Jan 2016 21:14:10 -0000	1.6.2.2
@@ -10,8 +10,12 @@
 }
 
 set admin_user_id [ad_conn user_id]
-set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"]
-set administration_name [db_string admin_name "select first_names || ' ' || last_name from persons where person_id = :admin_user_id"]
+set admin_email [db_string unused {
+    select email from parties where party_id = :admin_user_id
+}]
+set administration_name [db_string admin_name {
+    select first_names || ' ' || last_name from persons where person_id = :admin_user_id
+}]
 
 set context [list [list "./" "Users"] "Notify added user"]
 set system_name [ad_system_name]