Index: openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl,v diff -u -r1.33.2.5 -r1.33.2.6 --- openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl 12 Jul 2022 15:15:02 -0000 1.33.2.5 +++ openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl 22 Aug 2022 14:44:18 -0000 1.33.2.6 @@ -58,6 +58,7 @@ set proc_name [acs_sc_generate_name $contract $impl $operation] if { [namespace which $proc_name] ne "" } { + #ns_log notice "CALL FORMER ad_apply [list $proc_name {*}$call_args]" return [$proc_name {*}$call_args] } Index: openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl,v diff -u -r1.22.2.8 -r1.22.2.9 --- openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 12 Jul 2022 15:15:01 -0000 1.22.2.8 +++ openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 22 Aug 2022 14:44:18 -0000 1.22.2.9 @@ -70,6 +70,7 @@ set $name $val } } + #ns_log notice "FORMER ad_apply [list rss_gen {*}$args]" set xml [rss_gen {*}$args] # Write report. Index: openacs-4/packages/rss-support/www/subscr-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae.tcl,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/rss-support/www/subscr-ae.tcl 12 Jul 2022 15:15:01 -0000 1.10.2.1 +++ openacs-4/packages/rss-support/www/subscr-ae.tcl 22 Aug 2022 14:44:18 -0000 1.10.2.2 @@ -9,9 +9,10 @@ we pull out channel title and link. It would be very tempting to accept impl_name as an argument - instead of impl_id. However, the expanded call in acs_sc::invoke - raises the ugly possibility of code-smuggling through the url, so - we will force the use of the easily validated impl_id instead. + instead of impl_id. However, the direct application of the + procname in acs_sc::invoke raises the ugly possibility of + code-smuggling through the URL, so we will force the use of the + easily validated impl_id instead. } { subscr_id:optional,naturalnum @@ -21,11 +22,11 @@ {meta:optional 1} } -validate { subscr_or_context { - if { !(([info exists subscr_id]) || ([info exists impl_id] && [info exists summary_context_id])) } { - ad_complain "We were unable to - process your request. Please contact this site's - technical team for assistance." - } + if { !([info exists subscr_id] || ([info exists impl_id] && [info exists summary_context_id])) } { + ad_complain "We were unable to + process your request. Please contact this site's + technical team for assistance." + } } } @@ -56,27 +57,27 @@ if { ![info exists channel_title] || $channel_title eq "" || $channel_link eq "" } { if {!$meta} { - if {$channel_title eq ""} { - set channel_title "Summary Context $summary_context_id" - } + if {$channel_title eq ""} { + set channel_title "Summary Context $summary_context_id" + } } else { - # Pull out channel data by generating a summary. - # This is a convenient way to use a contracted operation - # but is not terribly efficient since we only need the channel title - # and link, and not the whole summary. - foreach {name val} [acs_sc::invoke -contract RssGenerationSubscriber -operation datasource -call_args $summary_context_id -impl $impl_name] { - if { [lsearch {channel_title channel_link} $name] >= 0 } { - set $name $val - } - } + # Pull out channel data by generating a summary. + # This is a convenient way to use a contracted operation + # but is not terribly efficient since we only need the channel title + # and link, and not the whole summary. + foreach {name val} [acs_sc::invoke -contract RssGenerationSubscriber -operation datasource -call_args $summary_context_id -impl $impl_name] { + if { [lsearch {channel_title channel_link} $name] >= 0 } { + set $name $val + } + } } } set formvars [export_vars -form {subscr_id \ - impl_id \ - summary_context_id \ - return_url \ - meta}] + impl_id \ + summary_context_id \ + return_url \ + meta}] set context [list Add/Edit]