Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v diff -u -r1.55.2.57 -r1.55.2.58 --- openacs-4/packages/xowiki/tcl/folder-procs.tcl 8 Nov 2022 13:24:14 -0000 1.55.2.57 +++ openacs-4/packages/xowiki/tcl/folder-procs.tcl 15 Dec 2022 19:30:02 -0000 1.55.2.58 @@ -42,7 +42,7 @@ } folders instproc include_head_entries {} { - switch [::${:package_id} get_parameter PreferredCSSToolkit bootstrap] { + switch [::${:package_id} get_parameter PreferredCSSToolkit:graph bootstrap] { yui {::xowiki::Tree include_head_entries -renderer yuitree -style folders} bootstrap - default { ::xowiki::Tree include_head_entries -renderer bootstrap3 } @@ -53,7 +53,7 @@ :get_parameters set tree [:build_tree] - switch [::${:package_id} get_parameter PreferredCSSToolkit bootstrap] { + switch [::${:package_id} get_parameter PreferredCSSToolkit:graph bootstrap] { yui { set js " var [:js_name]; @@ -364,7 +364,7 @@ # Check, if the optional context tree view is activated # set top_folder_of_tree $root_folder - if {$context_tree_view || [::$package_id get_parameter FolderContextTreeView false]} { + if {$context_tree_view || [::$package_id get_parameter FolderContextTreeView:boolean false]} { set parent_id [${:current_folder} parent_id] if {$parent_id ne -100} { set top_folder_of_tree $parent_id @@ -577,7 +577,7 @@ set ::__xowiki_folder_link [::$package_id make_link \ -link $current_folder_pretty_link \ $current_folder bulk-delete $csrf return_url] - switch [::$package_id get_parameter PreferredCSSToolkit bootstrap] { + switch [::$package_id get_parameter PreferredCSSToolkit:graph bootstrap] { bootstrap5 - bootstrap {set tableWidgetClass ::xowiki::BootstrapTable} default {set tableWidgetClass ::xowiki::YUIDataTable} 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.101 -r1.239.2.102 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 15 Dec 2022 13:17:42 -0000 1.239.2.101 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 15 Dec 2022 19:30:02 -0000 1.239.2.102 @@ -1683,7 +1683,7 @@ set entries [list] if {![info exists page]} { - set page [::$package_id get_parameter weblog_page] + set page [::$package_id get_parameter weblog_page:graph] } set href [::$package_id package_url]tag/ @@ -1721,7 +1721,7 @@ set p_link [${:__including_page} pretty_link] set return_url [::xo::cc url]?[::xo::cc actual_query] - set weblog_page [::$package_id get_parameter weblog_page weblog] + set weblog_page [::$package_id get_parameter weblog_page:graph weblog] set save_tag_link [::$package_id make_link -link $p_link ${:__including_page} \ save-tags return_url] set popular_tags_link [::$package_id make_link -link $p_link ${:__including_page} \ @@ -1781,7 +1781,7 @@ :get_parameters set content "" - set weblog_page [::$package_id get_parameter weblog_page weblog] + set weblog_page [::$package_id get_parameter weblog_page:graph weblog] set entries [list] set href [export_vars -base [::$package_id package_url]$weblog_page {summary}] set notification_type "" @@ -1933,7 +1933,7 @@ :get_parameters set publisher [ad_urlencode $publisher] - set feedname [ad_urlencode [::$package_id get_parameter PackageTitle [::$package_id instance_name]]] + set feedname [ad_urlencode [::$package_id get_parameter -check_query_parameter false PackageTitle [::$package_id instance_name]]] set rssurl [ad_urlencode $rssurl] set my_yahoo_link "http://us.rd.yahoo.com/my/atm/$publisher/$feedname/*http://add.my.yahoo.com/rss?url=$rssurl" 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.126 -r1.332.2.127 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 15 Dec 2022 13:17:42 -0000 1.332.2.126 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 15 Dec 2022 19:30:02 -0000 1.332.2.127 @@ -992,7 +992,7 @@ # use_connection_locale or subst_blank_in_name, etc.). # set value [:get_parameter_from_parameter_page \ - -parameter_page_name [:get_parameter parameter_page ""] \ + -parameter_page_name [:get_parameter parameter_page:graph ""] \ $attribute_name] } @@ -1590,7 +1590,7 @@ item_id ${:folder_id} \ method [:query_parameter m]] } else { - set object [${:id} get_parameter index_page "index"] + set object [${:id} get_parameter index_page:graph "index"] #:log "--o object after getting index_page is '$object'" } } @@ -2300,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 -check_query_parameter false weblog_page] + set weblog_page [:get_parameter -check_query_parameter false weblog_page:graph] :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 Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v diff -u -r1.75.2.20 -r1.75.2.21 --- openacs-4/packages/xowiki/tcl/weblog-procs.tcl 12 Apr 2022 08:43:10 -0000 1.75.2.20 +++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl 15 Dec 2022 19:30:02 -0000 1.75.2.21 @@ -277,7 +277,7 @@ if {${:filter_msg} ne ""} { set package ::${:package_id} - set all_href [$package package_url][$package get_parameter weblog_page weblog-portlet] + set all_href [$package package_url][$package get_parameter weblog_page:graph weblog-portlet] append :filter_msg ", $range of ${:nr_items} ${:entry_label} (all, $flink)" } else { append :filter_msg "Showing $range of ${:nr_items} ${:entry_label} ($flink)" Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v diff -u -r1.147.2.27 -r1.147.2.28 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 5 Sep 2022 15:07:20 -0000 1.147.2.27 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 15 Dec 2022 19:30:02 -0000 1.147.2.28 @@ -219,7 +219,7 @@ $data instvar package_id if {[$data istype ::xowiki::PodcastItem] && $duration eq "" && [$data exists import_file]} { set filename [expr {[$data exists full_file_name] ? [$data full_file_name] : [$data set import_file]}] - set ffmpeg [::$package_id get_parameter "ffmpeg" "/usr/bin/ffmpeg"] + set ffmpeg [::$package_id get_parameter -check_query_parameter false "ffmpeg" "/usr/bin/ffmpeg"] if {[ad_file exists $ffmpeg]} { catch {exec $ffmpeg -i $filename} output if {[info exists output]} { @@ -395,7 +395,7 @@ if {[${:data} exists_form_parameter text.format]} { ${:data} set mime_type [${:data} form_parameter text.format] } - if {$new && [[${:data} set package_id] get_parameter production_mode 0]} { + if {$new && [[${:data} set package_id] get_parameter production_mode:boolean 0]} { ${:data} set publish_status production } :tidy Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -r1.542.2.166 -r1.542.2.167 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 8 Nov 2022 13:24:14 -0000 1.542.2.166 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 15 Dec 2022 19:30:02 -0000 1.542.2.167 @@ -2171,7 +2171,7 @@ # we use as default decoration for included pages # the "portlet" decoration # - $page set __decoration [::$package_id get_parameter default-portlet-decoration portlet] + $page set __decoration [::$package_id get_parameter default-portlet-decoration:graph portlet] } } @@ -2893,8 +2893,8 @@ Page instproc get_rich_text_spec {field_name default} { set package_id ${:package_id} set spec "" - #:msg WidgetSpecs=[::$package_id get_parameter WidgetSpecs] - foreach {s widget_spec} [::$package_id get_parameter WidgetSpecs] { + #:msg WidgetSpecs=[::$package_id get_parameter -check_query_parameter false WidgetSpecs] + foreach {s widget_spec} [::$package_id get_parameter -check_query_parameter false WidgetSpecs] { lassign [split $s ,] page_name var_name # in case we have no name (edit new page) we use the first value or the default. set name [expr {[info exists :name] ? ${:name} : $page_name}] @@ -3135,7 +3135,7 @@ # # handle footer # - if {$with_footer && [::xo::cc get_parameter content-type text/html] eq "text/html"} { + if {$with_footer && [::xo::cc get_parameter content-type:graph text/html] eq "text/html"} { append content "
" if {![info exists :__no_footer] && ![::xo::cc get_parameter __no_footer:boolean 0]} { append content [:footer] @@ -3991,7 +3991,7 @@ PageInstance instproc widget_spec_from_folder_object {name given_template_name} { # get the widget field specifications from the payload of the folder object # for a field with a specified name in a specified page template - foreach {s widget_spec} [::${:package_id} get_parameter WidgetSpecs] { + foreach {s widget_spec} [::${:package_id} get_parameter -check_query_parameter false WidgetSpecs] { lassign [split $s ,] template_name var_name #ns_log notice "--w template_name $template_name, given '$given_template_name' varname=$var_name name=$name" if {([string match $template_name $given_template_name] || $given_template_name eq "") && 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 -r1.368.2.137 -r1.368.2.138 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 30 Nov 2022 08:36:46 -0000 1.368.2.137 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 15 Dec 2022 19:30:02 -0000 1.368.2.138 @@ -1667,7 +1667,7 @@ } { set package ::${:package_id} set limit [:query_parameter limit:int32 20] - set weblog_page [$package get_parameter weblog_page weblog] + set weblog_page [$package get_parameter weblog_page:graph weblog] set href [$package pretty_link -parent_id [$package folder_id] $weblog_page]?summary=1 set entries [list] @@ -1943,15 +1943,15 @@ #:msg "page_package_id=$page_package_id, context_package_id=$context_package_id" set template_file [ns_normalizepath [:query_parameter "template_file" \ - [::$context_package_id get_parameter template_file view-default]]] + [::$context_package_id get_parameter template_file:graph view-default]]] if {[nsf::is object ::xowiki::$template_file]} { $template_file before_render [self] } # # Set up template variables. # - set object_type [::$page_package_id get_parameter object_type [:info class]] + set object_type [::$page_package_id get_parameter object_type:graph [:info class]] set rev_link [::$page_package_id make_link [self] revisions] if {[::$context_package_id query_parameter m:token ""] eq "edit"} { @@ -2106,9 +2106,9 @@ # set-parameter. The cache-flush (next line) is not pretty here # and should be supported from xotcl-core. # - ::xo::cc unset -nocomplain cache([list $context_package_id get_parameter template_file]) + ::xo::cc unset -nocomplain cache([list $context_package_id get_parameter template_file:graph]) set template_file [:query_parameter "template_file" \ - [::$context_package_id get_parameter template_file view-default]] + [::$context_package_id get_parameter template_file:graph view-default]] # # If the template_file does not have a path, assume it in the # standard location. @@ -2251,7 +2251,7 @@ } } } else { - set :mime_type [::xo::cc get_parameter content-type text/html] + set :mime_type [::xo::cc get_parameter content-type:graph text/html] return $content } }