Index: openacs-4/packages/acs-tcl/tcl/admin-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-init.tcl,v diff -u -N -r1.9 -r1.9.2.1 --- openacs-4/packages/acs-tcl/tcl/admin-init.tcl 7 Aug 2017 23:47:59 -0000 1.9 +++ openacs-4/packages/acs-tcl/tcl/admin-init.tcl 6 Aug 2020 20:12:55 -0000 1.9.2.1 @@ -1,32 +1,38 @@ ad_library { - security filters for the admin pages. + Security filters for the admin pages. @creation-date 18 Nov 1998 @author Allen Pulsifer (pulsifer@mediaone.net) @cvs-id $Id$ } -# This can be very time consuming on a large site and may be -# disabled by setting RegisterRestrictToSSLFilters in the kernel params. -if { [security::https_available_p] +# +# This can be very time consuming on a large site and may be disabled +# by setting RegisterRestrictToSSLFilters in the kernel params. +# +if { [security::https_available_p] && [parameter::get -package_id [ad_acs_kernel_id] -parameter RegisterRestrictToSSLFilters -default 1]} { set admin_ssl_filters_installed_p 1 - db_foreach path_select {} { - ns_log Notice "admin-init.tcl: Processing RestrictToSSL for $url" - foreach pattern [parameter::get -package_id $package_id -parameter RestrictToSSL] { - ad_register_filter preauth GET "$url$pattern" ad_restrict_to_https - ns_log Notice "admin-init.tcl: URLs matching \"$url$pattern\" are restricted to SSL" - } + db_foreach path_select {} { + ns_log Notice "admin-init.tcl: Processing RestrictToSSL for $url" + foreach pattern [parameter::get -package_id $package_id -parameter RestrictToSSL] { + ad_register_filter preauth GET "$url$pattern" ad_restrict_to_https + ns_log Notice "admin-init.tcl: URLs matching \"$url$pattern\" are restricted to SSL" + } } - + db_release_unused_handles } -# if the kernel param is on, then these filters will be registered. after that, -# a subsite param controls whether that subsite is restricted or not +# +# If the kernel param is on, then these filters will be registered. +# after that, a subsite param controls whether that subsite is +# restricted or not. +# + if { [parameter::get -package_id [ad_acs_kernel_id] -parameter RegisterRestrictEntireServerToRegisteredUsersFilters -default 0]} { db_foreach path_select {} { ns_log Notice "admin-init.tcl: Registering ad_restrict_entire_server_to_registered_users for ${url}*" Index: openacs-4/packages/acs-tcl/tcl/cluster-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/cluster-init.tcl,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/acs-tcl/tcl/cluster-init.tcl 26 Jun 2018 09:10:44 -0000 1.1 +++ openacs-4/packages/acs-tcl/tcl/cluster-init.tcl 6 Aug 2020 20:12:55 -0000 1.1.2.1 @@ -4,42 +4,42 @@ if {[server_cluster_enabled_p]} { set my_ip [ns_config ns/server/[ns_info server]/module/nssock Address] set my_port [ns_config ns/server/[ns_info server]/module/nssock port] - + foreach host [server_cluster_all_hosts] { - set port 80 - regexp {^(.*):(.*)} $host _ host port - if {"$host-$port" eq "$my_ip-$my_port"} continue - ::acs::Cluster create CS_${host}_$port -host $host -port $port + set port 80 + regexp {^(.*):(.*)} $host _ host port + if {"$host-$port" eq "$my_ip-$my_port"} continue + ::acs::Cluster create CS_${host}_$port -host $host -port $port } - + foreach ip [parameter::get -package_id [ad_acs_kernel_id] -parameter ClusterAuthorizedIP] { - if {[string first * $ip] > -1} { - ::acs::Cluster eval [subst { - :lappend allowed_host_patterns $ip - }] - } else { - ::acs::Cluster eval [subst { - set :allowed_host($ip) 1 - }] - } + if {[string first * $ip] > -1} { + ::acs::Cluster eval [subst { + :lappend allowed_host_patterns $ip + }] + } else { + ::acs::Cluster eval [subst { + set :allowed_host($ip) 1 + }] + } } - + set url [::acs::Cluster eval {set :url}] # Check, if the filter url mirrors a site node. If so, # the cluster mechanism will not work, if the site node # requires a login. Clustering will only work if the # root node is freely accessible. - array set node [site_node::get -url $url] + array set node [site_node::get -url $url] if {$node(url) ne "/"} { - ns_log notice "***\n*** WARNING: there appears a package mounted on\ + ns_log notice "***\n*** WARNING: there appears a package mounted on\ $url\n***Cluster configuration will not work\ since there is a conflict with the AOLserver filter with the same name!\n" } - + #ns_register_filter trace GET $url ::acs::Cluster - ns_register_filter preauth GET $url ::acs::Cluster + ns_register_filter preauth GET $url ::acs::Cluster #ad_register_filter -priority 900 preauth GET $url ::acs::Cluster } Index: openacs-4/packages/acs-tcl/tcl/community-core-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-init.tcl,v diff -u -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/acs-tcl/tcl/community-core-init.tcl 9 Feb 2020 15:23:29 -0000 1.4.2.1 +++ openacs-4/packages/acs-tcl/tcl/community-core-init.tcl 6 Aug 2020 20:12:55 -0000 1.4.2.2 @@ -12,13 +12,13 @@ # ns_cache create party_info_cache \ -size [parameter::get \ - -package_id [apm_package_id_from_key acs-tcl] \ - -parameter PartyInfoCacheSize \ - -default 2000000] \ + -package_id [apm_package_id_from_key acs-tcl] \ + -parameter PartyInfoCacheSize \ + -default 2000000] \ -timeout [parameter::get \ - -package_id [apm_package_id_from_key acs-tcl] \ - -parameter PartyInfoCacheTimeout \ - -default 3600] + -package_id [apm_package_id_from_key acs-tcl] \ + -parameter PartyInfoCacheTimeout \ + -default 3600] # # Create a cache for keeping person_info @@ -34,13 +34,13 @@ # ns_cache create person_info_cache \ -size [parameter::get \ - -package_id [apm_package_id_from_key acs-tcl] \ - -parameter PersonInfoCacheSize \ - -default 2000000] \ + -package_id [apm_package_id_from_key acs-tcl] \ + -parameter PersonInfoCacheSize \ + -default 2000000] \ -timeout [parameter::get \ - -package_id [apm_package_id_from_key acs-tcl] \ - -parameter PersonInfoCacheTimeout \ - -default 3600] + -package_id [apm_package_id_from_key acs-tcl] \ + -parameter PersonInfoCacheTimeout \ + -default 3600] # @@ -57,13 +57,13 @@ # ns_cache create user_info_cache \ -size [parameter::get \ - -package_id [apm_package_id_from_key acs-tcl] \ - -parameter UserInfoCacheSize \ - -default 2000000] \ + -package_id [apm_package_id_from_key acs-tcl] \ + -parameter UserInfoCacheSize \ + -default 2000000] \ -timeout [parameter::get \ - -package_id [apm_package_id_from_key acs-tcl] \ - -parameter UserInfoCacheTimeout \ - -default 3600] + -package_id [apm_package_id_from_key acs-tcl] \ + -parameter UserInfoCacheTimeout \ + -default 3600] Index: openacs-4/packages/acs-tcl/tcl/tcltrace-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcltrace-init.tcl,v diff -u -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/acs-tcl/tcl/tcltrace-init.tcl 7 Apr 2020 09:18:22 -0000 1.4.2.1 +++ openacs-4/packages/acs-tcl/tcl/tcltrace-init.tcl 6 Aug 2020 20:12:55 -0000 1.4.2.2 @@ -14,10 +14,10 @@ TclTraceSaveNsReturn 0 {trace add execution ::ns_return enter {::tcltrace::before-ns_return}} } { if {[::parameter::get_from_package_key \ - -package_key acs-tcl \ - -parameter $parameter \ - -default $default] ne $default} { - append trace \n$cmd + -package_key acs-tcl \ + -parameter $parameter \ + -default $default] ne $default} { + append trace \n$cmd } } Index: openacs-4/packages/acs-tcl/tcl/utilities-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-init.tcl,v diff -u -N -r1.10.2.2 -r1.10.2.3 --- openacs-4/packages/acs-tcl/tcl/utilities-init.tcl 6 Jun 2020 09:24:00 -0000 1.10.2.2 +++ openacs-4/packages/acs-tcl/tcl/utilities-init.tcl 6 Aug 2020 20:12:55 -0000 1.10.2.3 @@ -18,7 +18,7 @@ if { $logmaxbackup } { ad_schedule_proc -all_servers t -schedule_proc ns_schedule_daily \ - [list 00 00] util::roll_server_log + [list 00 00] util::roll_server_log } # Local variables: