Index: openacs-4/packages/acs-admin/www/apm/parameter-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add.tcl,v diff -u -r1.9 -r1.9.4.1 --- openacs-4/packages/acs-admin/www/apm/parameter-add.tcl 4 Oct 2010 21:59:20 -0000 1.9 +++ openacs-4/packages/acs-admin/www/apm/parameter-add.tcl 7 Sep 2013 08:37:57 -0000 1.9.4.1 @@ -8,7 +8,7 @@ {section_name ""} } -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] set parameter_id [db_nextval acs_object_id_seq] db_1row apm_get_name {} Index: openacs-4/packages/acs-developer-support/lib/footer.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/footer.tcl,v diff -u -r1.13 -r1.13.4.1 --- openacs-4/packages/acs-developer-support/lib/footer.tcl 9 Jan 2010 02:00:44 -0000 1.13 +++ openacs-4/packages/acs-developer-support/lib/footer.tcl 7 Sep 2013 08:37:58 -0000 1.13.4.1 @@ -34,7 +34,7 @@ if { $user_switching_p } { set show_p 1 - set fake_user_id [ad_get_user_id] + set fake_user_id [ad_conn user_id] set real_user_id [ds_get_real_user_id] if { $fake_user_id == 0 } { Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v diff -u -r1.52.2.1 -r1.52.2.2 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 5 Sep 2013 11:38:46 -0000 1.52.2.1 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 7 Sep 2013 08:37:58 -0000 1.52.2.2 @@ -426,7 +426,7 @@ expensive (returns a big file) for openacs instances with a large number of users, so perhaps best used on test instances. } { - set user_id [ad_get_user_id] + set user_id [ad_conn user_id] set real_user_id [ds_get_real_user_id] set return_url [ad_conn url] @@ -571,7 +571,7 @@ #ds_comment "Enabling user-switching" # let the user stay who he is now (but ignore any error trying to do so) catch { - ad_set_client_property developer-support user_id [ad_get_user_id] + ad_set_client_property developer-support user_id [ad_conn user_id] } rename ad_conn orig_ad_conn rename ad_get_user_id orig_ad_get_user_id Index: openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/set-on-vacation-to-null.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.tcl 10 Jan 2007 21:22:09 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.tcl 7 Sep 2013 08:37:58 -0000 1.2.10.1 @@ -9,7 +9,7 @@ home_link:onevalue } -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] set no_alerts_until [db_string no_alerts_until { select no_alerts_until from users where user_id = :user_id Index: openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/set-on-vacation-until.tcl,v diff -u -r1.3 -r1.3.22.1 --- openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.tcl 30 Nov 2002 17:22:53 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.tcl 7 Sep 2013 08:37:58 -0000 1.3.22.1 @@ -20,7 +20,7 @@ return } -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] db_transaction { # We update the users table to maintain compatibility with acs installations prior to user_vacations Index: openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl 18 Sep 2002 12:16:45 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl 7 Sep 2013 08:37:59 -0000 1.2.26.1 @@ -1,6 +1,6 @@ # $Id$ -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -r1.108.2.3 -r1.108.2.4 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 5 Sep 2013 18:15:02 -0000 1.108.2.3 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 7 Sep 2013 08:37:59 -0000 1.108.2.4 @@ -1081,7 +1081,7 @@ # Obtain the portion of the email address before the at sign. We'll use this in the name of # the backup directory for the package. - regsub {@.+} [cc_email_from_party [ad_get_user_id]] "" my_email_name + regsub {@.+} [cc_email_from_party [ad_conn user_id]] "" my_email_name set backup_dir "[apm_workspace_dir]/$package_key-removed-$my_email_name-[ns_fmttime [ns_time] "%Y%m%d-%H:%M:%S"]" 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.62.2.1 -r1.62.2.2 --- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 6 Sep 2013 15:48:06 -0000 1.62.2.1 +++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 7 Sep 2013 08:37:59 -0000 1.62.2.2 @@ -97,7 +97,7 @@ ad_proc -public ad_site_home_link {} { @return a link to the user's workspace if the user is logged in. Otherwise, a link to the page root. } { - if { [ad_get_user_id] != 0 } { + if { [ad_conn user_id] != 0 } { return "[subsite::get_element -element name]" } else { # we don't know who this person is Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v diff -u -r1.74.2.1 -r1.74.2.2 --- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 16 Aug 2013 18:57:26 -0000 1.74.2.1 +++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 7 Sep 2013 08:37:59 -0000 1.74.2.2 @@ -1414,7 +1414,7 @@ @see ad_conn } { - set session_user_id [ad_get_user_id] + set session_user_id [ad_conn user_id] if {$session_user_id == 0} { # viewer of this page isn't logged in, only show stuff # that is extremely unprivate