Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml,v diff -u -r1.10 -r1.10.12.1 --- openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml 17 Jul 2006 05:38:37 -0000 1.10 +++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml 7 Sep 2013 14:36:49 -0000 1.10.12.1 @@ -94,7 +94,7 @@ } -query { } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_1row user_name { select first_names || ' ' || last_name as user_name 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.2 -r1.52.2.3 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 7 Sep 2013 08:37:58 -0000 1.52.2.2 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 7 Sep 2013 14:36:49 -0000 1.52.2.3 @@ -574,30 +574,30 @@ 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 - rename ad_verify_and_get_user_id orig_ad_verify_and_get_user_id + #rename ad_get_user_id orig_ad_get_user_id + #rename ad_verify_and_get_user_id orig_ad_verify_and_get_user_id proc ad_conn { args } { ds_conn {*}$args } proc ad_get_user_id {} { ds_get_user_id } - proc ad_verify_and_get_user_id {} { - ds_get_user_id - } + #proc ad_verify_and_get_user_id {} { + # ds_get_user_id + #} } } else { #ds_comment "Disabling user-switching" if { [info commands orig_ad_get_user_id] ne ""} { rename ad_conn {} rename orig_ad_conn ad_conn - rename ad_get_user_id {} - rename orig_ad_get_user_id ad_get_user_id + #rename ad_get_user_id {} + #rename orig_ad_get_user_id ad_get_user_id - rename ad_verify_and_get_user_id {} - rename orig_ad_verify_and_get_user_id ad_verify_and_get_user_id + #rename ad_verify_and_get_user_id {} + #rename orig_ad_verify_and_get_user_id ad_verify_and_get_user_id } } } Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.tcl,v diff -u -r1.2 -r1.2.12.1 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.tcl 4 Jun 2006 00:45:54 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.tcl 7 Sep 2013 14:36:49 -0000 1.2.12.1 @@ -14,8 +14,4 @@ {fs_package_id folder_id selector_type file_types}] set fs_found 1 -#set user_id [ad_verify_and_get_user_id] -#permission::require_permission -party_id $user_id -object_id $fs_package_id \ -# -privilege "admin" - ad_return_template Index: openacs-4/packages/acs-templating/www/scripts/xinha/insert-ilink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/insert-ilink.tcl,v diff -u -r1.1 -r1.1.12.1 --- openacs-4/packages/acs-templating/www/scripts/xinha/insert-ilink.tcl 18 Aug 2006 19:00:07 -0000 1.1 +++ openacs-4/packages/acs-templating/www/scripts/xinha/insert-ilink.tcl 7 Sep 2013 14:36:50 -0000 1.1.12.1 @@ -14,8 +14,4 @@ {fs_package_id folder_id selector_type file_types}] set fs_found 1 -#set user_id [ad_verify_and_get_user_id] -#permission::require_permission -party_id $user_id -object_id $fs_package_id \ -# -privilege "admin" - ad_return_template Index: openacs-4/packages/forums/lib/message/threads-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.tcl,v diff -u -r1.14 -r1.14.4.1 --- openacs-4/packages/forums/lib/message/threads-chunk.tcl 9 Nov 2008 23:29:26 -0000 1.14 +++ openacs-4/packages/forums/lib/message/threads-chunk.tcl 7 Sep 2013 14:36:50 -0000 1.14.4.1 @@ -8,7 +8,7 @@ if {![info exists flush_p]} {set flush_p 0} -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # Get forum data forum::get -forum_id $forum_id -array forum Index: openacs-4/packages/forums/www/mark-all-read.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/mark-all-read.tcl,v diff -u -r1.2 -r1.2.4.1 --- openacs-4/packages/forums/www/mark-all-read.tcl 9 Nov 2008 23:29:26 -0000 1.2 +++ openacs-4/packages/forums/www/mark-all-read.tcl 7 Sep 2013 14:36:50 -0000 1.2.4.1 @@ -1,16 +1,16 @@ -ad_page_contract { - - one forum view - - @author Andreas Benisch (andreas.benisch@wu-wien.ac.at) - @creation-date 2004-09-06 - -} { - forum_id:integer,notnull -} - - set user_id [ad_verify_and_get_user_id] - set db_antwort [db_exec_plsql forums_reading_info__user_add_forum {}] - - -ad_returnredirect forum-view?forum_id=$forum_id +ad_page_contract { + + one forum view + + @author Andreas Benisch (andreas.benisch@wu-wien.ac.at) + @creation-date 2004-09-06 + +} { + forum_id:integer,notnull +} + + set user_id [ad_conn user_id] + set db_antwort [db_exec_plsql forums_reading_info__user_add_forum {}] + + +ad_returnredirect forum-view?forum_id=$forum_id Index: openacs-4/packages/xowiki/www/xinha/insert-ilink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/insert-ilink.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/xowiki/www/xinha/insert-ilink.tcl 13 Sep 2012 16:07:08 -0000 1.6 +++ openacs-4/packages/xowiki/www/xinha/insert-ilink.tcl 7 Sep 2013 14:36:50 -0000 1.6.2.1 @@ -14,8 +14,4 @@ {fs_package_id folder_id selector_type file_types}] set fs_found 1 -#set user_id [ad_verify_and_get_user_id] -#permission::require_permission -party_id $user_id -object_id $fs_package_id \ -# -privilege "admin" - ad_return_template