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 -N -r1.332.2.133 -r1.332.2.134 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 19 Apr 2023 17:31:26 -0000 1.332.2.133 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 12 May 2023 18:16:59 -0000 1.332.2.134 @@ -2730,9 +2730,9 @@ -from [string trim [:form_parameter from ""]] \ -to [string trim [:form_parameter to ""]] \ -clean [string trim [:form_parameter clean ""]] \ - -folder_id [string trim [:form_parameter folder_id ${:folder_id}]] \ + -folder_id [string trim [:form_parameter folder_id:int32 ${:folder_id}]] \ -package_id ${:id} \ - -publish_status [string trim [:form_parameter publish_status "ready|live|expired"]] + -publish_status [string trim [:form_parameter publish_status:word "ready|live|expired"]] set :mime_type text/plain return "" @@ -2967,7 +2967,7 @@ # access to the ::xowiki::PageTemplate of the # ::xowiki::PageInstance. # - $page set page_template [:form_parameter page_template] + $page set page_template [:form_parameter page_template:int32] } set source_item_id [${:id} query_parameter source_item_id:int32 ""] Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -N -r1.368.2.141 -r1.368.2.142 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 29 Mar 2023 14:12:25 -0000 1.368.2.141 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 12 May 2023 18:17:00 -0000 1.368.2.142 @@ -36,7 +36,7 @@ :msg "nothing to delete" } - set instantiate_p [:form_parameter instantiate_p false] + set instantiate_p [:form_parameter instantiate_p:boolean false] set item_ids [:get_ids_for_bulk_actions [:form_parameter objects]] foreach item_id $item_ids { @@ -307,7 +307,7 @@ if {![info exists :parent_id]} { set :parent_id [::${:package_id} folder_id] } - set fp_parent_id [:form_parameter "parent_id" [:query_parameter parent_id:int32 ${:parent_id}]] + set fp_parent_id [:form_parameter parent_id [:query_parameter parent_id:int32 ${:parent_id}]] } else { set fp_parent_id $parent_id } @@ -321,7 +321,7 @@ # In case the Form is inherited and package_id was not specified, we # use the actual package_id. - set fp_package_id [:form_parameter "package_id" [:query_parameter package_id:int32 ${:package_id}]] + set fp_package_id [:form_parameter package_id [:query_parameter package_id:int32 ${:package_id}]] # # Handling publish_status. When the publish_status is provided via @@ -1185,7 +1185,7 @@ set content [:render -update_references all] #:log "after save refs=[expr {[info exists :references]?${:references} : {NONE}}]" - set redirect_method [:form_parameter __form_redirect_method "view"] + set redirect_method [:form_parameter __form_redirect_method:word "view"] #:log "redirect_method $redirect_method" if {$redirect_method eq "__none"} { @@ -1216,7 +1216,7 @@ # We have nothing to save (maybe everything is read-only). Check # __feedback_mode to prevent recursive loops. # - set redirect_method [:form_parameter __form_redirect_method "view"] + set redirect_method [:form_parameter __form_redirect_method:word "view"] #:log "__redirect_method=$redirect_method" return [:www-view] } else { @@ -1404,7 +1404,7 @@ set return_url [ad_urlencode_url $return_url] } } - set m [:form_parameter __form_redirect_method "edit"] + set m [:form_parameter __form_redirect_method:word "edit"] set url [export_vars -no_base_encode -base [:action_url] {m return_url}] #:log "=== setting action <$url> for form-action my-name ${:name}" $formNode setAttribute action $url method POST role form