Index: openacs-4/packages/acs-lang/www/change-locale-include.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/change-locale-include.tcl,v diff -u -N -r1.19.2.3 -r1.19.2.4 --- openacs-4/packages/acs-lang/www/change-locale-include.tcl 15 Oct 2019 06:17:47 -0000 1.19.2.3 +++ openacs-4/packages/acs-lang/www/change-locale-include.tcl 11 Dec 2019 18:13:56 -0000 1.19.2.4 @@ -5,7 +5,7 @@ @author Christian Hvid @author Guenter Ernst (guenter.ernst@wu.ac.at) } { - {return_url:localurl "[get_referrer -relative]"} + {return_url:localurl "[util::get_referrer -relative]"} {package_id:naturalnum "[ad_conn package_id]"} } Index: openacs-4/packages/acs-subsite/www/shared/session-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/session-update.tcl,v diff -u -N -r1.5 -r1.5.2.1 --- openacs-4/packages/acs-subsite/www/shared/session-update.tcl 5 Jan 2018 22:40:56 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/shared/session-update.tcl 11 Dec 2019 18:13:56 -0000 1.5.2.1 @@ -25,7 +25,7 @@ return_url:localurl } -validate { referrer_error { - if { $session_property(referrer) ne [get_referrer] } { + if { $session_property(referrer) ne [util::get_referrer] } { ad_complain "Expected referrer does not match actual referrer" } } Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v diff -u -N -r1.153.2.14 -r1.153.2.15 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 29 Nov 2019 15:30:15 -0000 1.153.2.14 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 11 Dec 2019 18:13:56 -0000 1.153.2.15 @@ -859,7 +859,7 @@ set error_url "[ad_url][ad_conn url]?[export_entire_form_as_url_vars]" set error_file [ad_conn file] #set package_key [ad_conn package_key] - set prev_url [get_referrer] + set prev_url [util::get_referrer] set feedback_id [db_nextval acs_object_id_seq] set user_id [ad_conn user_id] set bug_package_id [ad_conn package_id] Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v diff -u -N -r1.61.2.1 -r1.61.2.2 --- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl 29 Mar 2019 20:47:52 -0000 1.61.2.1 +++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl 11 Dec 2019 18:13:56 -0000 1.61.2.2 @@ -1199,7 +1199,7 @@ ad_try { set html [ad_parse_template \ -params [list complaints [list context $::ad_page_contract_context] \ - [list prev_url [get_referrer]] \ + [list prev_url [util::get_referrer]] \ ] [template::themed_template "/packages/acs-tcl/lib/complain"]] } on error {errorMsg} { set errorCode $::errorCode @@ -2280,7 +2280,7 @@ ns_return 422 text/html [ad_parse_template \ -params [list [list exception_count $exception_count] \ [list exception_text $exception_text] \ - [list prev_url [get_referrer]] \ + [list prev_url [util::get_referrer]] \ ] $complaint_template] } Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v diff -u -N -r1.189.2.41 -r1.189.2.42 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 29 Nov 2019 15:30:57 -0000 1.189.2.41 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 11 Dec 2019 18:13:56 -0000 1.189.2.42 @@ -334,20 +334,43 @@ # debugging kludges -ad_proc -public NsSettoTclString {set_id} { +ad_proc -deprecated NsSettoTclString {set_id} { returns a plain text version of the passed ns_set id + + @see util::ns_set_to_tcl_string + + DEPRECATED: does not comply with OpenACS naming convention } { + return [util::ns_set_to_tcl_string $set_id] +} + +ad_proc -public util::ns_set_to_tcl_string {set_id} { + returns a plain text version of the passed ns_set id +} { set result "" for {set i 0} {$i<[ns_set size $set_id]} {incr i} { append result "[ns_set key $set_id $i] : [ns_set value $set_id $i]\n" } return $result } -ad_proc -public get_referrer {-relative:boolean} { +ad_proc -deprecated get_referrer args { @return referrer from the request headers. @param relative return the refer without protocol and host + + DEPRECATED: does not comply with OpenACS naming convention. + + @see util::get_referrer } { + return [util::get_referrer {*}$args] +} + +ad_proc -public util::get_referrer { + -relative:boolean +} { + @return referrer from the request headers. + @param relative return the refer without protocol and host +} { set url [ns_set get [ns_conn headers] Referer] if {$relative_p} { # In case the referrer URL has a protocol and host remove it @@ -356,6 +379,7 @@ return $url } + ## # Database-related code ## Index: openacs-4/packages/categories/lib/map.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/map.tcl,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/categories/lib/map.tcl 7 Aug 2017 23:48:05 -0000 1.3 +++ openacs-4/packages/categories/lib/map.tcl 11 Dec 2019 18:13:57 -0000 1.3.2.1 @@ -24,7 +24,7 @@ $category_ids } -ad_returnredirect [get_referrer] +ad_returnredirect [util::get_referrer] # Local variables: # mode: tcl Index: openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl,v diff -u -N -r1.5 -r1.5.2.1 --- openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl 7 Aug 2017 23:48:10 -0000 1.5 +++ openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl 11 Dec 2019 18:13:57 -0000 1.5.2.1 @@ -9,7 +9,7 @@ } -properties { } -set return_url [get_referrer] +set return_url [util::get_referrer] array set config $cf set user_id [ad_conn user_id] set list_of_package_ids $config(package_id) Index: openacs-4/packages/faq/www/categories/remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/remove.tcl,v diff -u -N -r1.4 -r1.4.2.1 --- openacs-4/packages/faq/www/categories/remove.tcl 19 Jan 2018 14:44:17 -0000 1.4 +++ openacs-4/packages/faq/www/categories/remove.tcl 11 Dec 2019 18:13:57 -0000 1.4.2.1 @@ -6,7 +6,7 @@ db_dml nuke {delete from category_object_map where category_id = :cat and object_id = :object_id} -ad_returnredirect -message "removed category" [get_referrer] +ad_returnredirect -message "removed category" [util::get_referrer] ad_script_abort # Local variables: