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 -N -r1.123 -r1.124 --- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 22 Dec 2018 10:24:27 -0000 1.123 +++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 15 Jan 2019 18:30:56 -0000 1.124 @@ -1111,17 +1111,16 @@ unregistered, except the site index page and stuff underneath [subsite]/register. Use permissions on the site node map to control access. } { - if {"/favicon.ico" ne [ad_conn url] - && "/index.tcl" ne [ad_conn url] - && "/" ne [ad_conn url] - && ![string match "/global/*" [ad_conn url]] - && ![string match "*/register/*" [ad_conn url]] - && ![string match "*/SYSTEM/*" [ad_conn url]] - && ![string match "*/user_please_login.tcl" [ad_conn url]]} { + set url [ad_conn url] + if {$url ni {"/favicon.ico" "/index.tcl" "/"} + && ![string match "/global/*" $url] + && ![string match "*/register/*" $url] + && ![string match "*/SYSTEM/*" $url] + && ![string match "*/user_please_login.tcl" $url]} { # not one of the magic acceptable URLs set user_id [ad_conn user_id] if {$user_id == 0} { - ad_returnredirect "[subsite::get_element -element url]register/?return_url=[ns_urlencode [ad_conn url]?[ad_conn query]]" + auth::require_login return filter_return } }