Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -r1.284.2.230 -r1.284.2.231 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 12 Nov 2022 17:05:23 -0000 1.284.2.230 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 15 Dec 2022 13:17:42 -0000 1.284.2.231 @@ -2255,7 +2255,7 @@ if {![:istype image]} { append href ?filename=[ns_urlencode $fn] - if {$revision_id ne "" && [string is integer $revision_id]} { + if {[nsf::is integer $revision_id]} { append href &revision_id=$revision_id } } Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v diff -u -r1.239.2.100 -r1.239.2.101 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 17 Oct 2022 12:01:37 -0000 1.239.2.100 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 15 Dec 2022 13:17:42 -0000 1.239.2.101 @@ -249,7 +249,7 @@ set ands [list] set and_names [list] foreach cid_and [split $cid_or ,] { - if {![string is integer -strict $cid_and]} { + if {![nsf::is integer $cid_and]} { ad_return_complaint 1 "invalid category id '$cid_and'" ad_script_abort } @@ -1055,7 +1055,7 @@ foreach cid [split $category_ids ,] { set or_ids [split $cid |] foreach or_id $or_ids { - if {![string is integer $or_id]} { + if {![nsf::is integer $or_id]} { ad_return_complaint 1 "invalid category_id" ad_script_abort } @@ -1785,7 +1785,7 @@ set entries [list] set href [export_vars -base [::$package_id package_url]$weblog_page {summary}] set notification_type "" - if {[::$package_id get_parameter "with_notifications" 1] && + if {[::$package_id get_parameter with_notifications:boolean 1] && [::xo::cc user_id] != 0} { ;# notifications require login set notification_type [notification::type::get_type_id -short_name xowiki_notif] } @@ -2245,7 +2245,7 @@ #set js "YAHOO.xo_page_order_region.DDApp.package_url = '[::${:package_id} package_url]';\n" set last_level 0 set ID [:js_name] - if {[string is integer -strict $allow_reorder]} { + if {[nsf::is integer $allow_reorder]} { set min_level $allow_reorder } else { set min_level 1 Index: openacs-4/packages/xowiki/tcl/package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v diff -u -r1.332.2.125 -r1.332.2.126 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 8 Nov 2022 13:24:14 -0000 1.332.2.125 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 15 Dec 2022 13:17:42 -0000 1.332.2.126 @@ -794,7 +794,7 @@ :get_lang_and_name -default_lang $lang -name $name lang name - set package_prefix [:get_parameter package_prefix ${:package_url}] + set package_prefix [:get_parameter -check_query_parameter false package_prefix ${:package_url}] if {$package_prefix eq "/" && [string length $lang]>2} { # # Don't compact the path for images etc. to avoid conflicts @@ -1605,12 +1605,13 @@ } #:log "object <$object>" - if {$(item_id) == 0 && [:get_parameter fallback_languages ""] ne ""} { - foreach fallback_lang [:get_parameter fallback_languages ""] { - if {$fallback_lang ne $lang} { - array set "" [:item_info_from_url -with_package_prefix false -default_lang $fallback_lang $object] + set fallback_languages [:get_parameter -check_query_parameter false fallback_languages ""] + if {$(item_id) == 0 && $fallback_languages ne ""} { + foreach fallback_language $fallback_languages { + if {$fallback_language ne $lang} { + array set "" [:item_info_from_url -with_package_prefix false -default_lang $fallback_language $object] if { $(item_id) != 0 } { - :log "item_info_from_url based on fallback_lang <$fallback_lang> returns [array get {}]" + :log "item_info_from_url based on fallback_lang <$fallback_language> returns [array get {}]" break } } @@ -1745,7 +1746,7 @@ # set packages [list] set package_url [string trimright [:package_url] /] - set package_path [:get_parameter PackagePath] + set package_path [:get_parameter -check_query_parameter false PackagePath] # # To avoid recursions, remove the current package from the list of # packages if was accidentally included. Get the package objects @@ -2029,7 +2030,7 @@ set elements [split $llink /] # Get start-page, if path is empty if {[llength $elements] == 0} { - set link [:get_parameter index_page "index"] + set link [:get_parameter -check_query_parameter false index_page "index"] set elements [list $link] } @@ -2299,7 +2300,7 @@ set summary [::xo::cc query_parameter summary:boolean 0] set popular [::xo::cc query_parameter popular:boolean 0] set tag_kind [expr {$popular ? "ptag" :"tag"}] - set weblog_page [:get_parameter weblog_page] + set weblog_page [:get_parameter -check_query_parameter false weblog_page] :get_lang_and_name -default_lang $default_lang -name $weblog_page (lang) local_name set :object $weblog_page ::xo::cc set actual_query $tag_kind=$tag&summary=$summary @@ -2754,15 +2755,15 @@ } { set folder_id [::${:id} folder_id] if {![info exists name_filter]} { - set name_filter [:get_parameter -type word name_filter ""] + set name_filter [:get_parameter -check_query_parameter false -type word name_filter ""] } if {![info exists entries_of]} { - set entries_of [:get_parameter -type noquote entries_of ""] + set entries_of [:get_parameter -check_query_parameter false -type noquote entries_of ""] } if {![info exists title]} { - set title [:get_parameter PackageTitle [:instance_name]] + set title [:get_parameter -check_query_parameter false PackageTitle ${:instance_name}] } - set description [:get_parameter PackageDescription ""] + set description [:get_parameter -check_query_parameter false PackageDescription ""] if {![info exists days]} { set rss_query_parameter [:query_parameter rss] Index: openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl,v diff -u -r1.1.2.78 -r1.1.2.79 --- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl 16 Aug 2022 14:33:54 -0000 1.1.2.78 +++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl 15 Dec 2022 13:17:42 -0000 1.1.2.79 @@ -1483,7 +1483,7 @@ $file_object set import_file \ $::acs::rootdir/packages/acs-templating/www/resources/sort-ascending.png $file_object save_new - aa_true "$file_object was saved" [string is integer [$file_object item_id]] + aa_true "$file_object was saved" [nsf::is integer [$file_object item_id]] aa_section "load [$parent_page name] and check links" set d [acs::test::http -last_request $request_info [$parent_page pretty_link]]