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.137 -r1.138 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 11 Sep 2017 12:35:23 -0000 1.137 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 21 Oct 2017 17:35:58 -0000 1.138 @@ -47,41 +47,40 @@ } WikiForm instproc mkFields {} { - my instvar data autoname set __fields "" - set field_list [my field_list] - set show_page_order [[$data package_id] show_page_order] + set field_list [:field_list] + set show_page_order [[${:data} package_id] show_page_order] if {!$show_page_order} { my f.page_order "= hidden" } - if {$autoname} { my f.name "= hidden,optional"} + if {${:autoname}} { my f.name "= hidden,optional"} set form_fields [list] foreach __field $field_list { # if there is no field spec, use the default from the slot definitions - set __spec [expr {[my exists f.$__field] ? [my set f.$__field] : "="}] + set __spec [expr {[:exists f.$__field] ? [:set f.$__field] : "="}] set __wspec [lindex $__spec 0] #my msg "$__field: wspec=$__wspec, spec=$__spec" # check first if we have widget_specs. # TODO: this part is likely to be removed in the future. if { - [$data istype ::xowiki::PlainPage] && $__field eq "text" - || [$data istype ::xowiki::File] && $__field eq "text" + [${:data} istype ::xowiki::PlainPage] && $__field eq "text" + || [${:data} istype ::xowiki::File] && $__field eq "text" } { set s "" } else { - set s [$data get_rich_text_spec $__field ""] + set s [${:data} get_rich_text_spec $__field ""] } if {$s ne ""} { #my msg "we got richtext spec for $__field = '$s'" set __spec $s set __wspec [lindex $__spec 0] # old style folder spec substituion. ugly. - if {[my folderspec] ne ""} { + if {[:folderspec] ne ""} { # append the folder spec to its options set __newspec [list $__wspec] foreach __e [lrange $__spec 1 end] { lassign $__e __name __value - if {$__name eq "options"} {lappend __value {*}[my folderspec]} + if {$__name eq "options"} {lappend __value {*}[:folderspec]} lappend __newspec [list $__name $__value] } #my msg "--F rewritten spec is '$__newspec'" @@ -92,19 +91,19 @@ # get the information from the attribute definitions & given specs # - set f [$data create_raw_form_field \ + set f [${:data} create_raw_form_field \ -name $__field \ - -slot [$data find_slot $__field] \ + -slot [${:data} find_slot $__field] \ -spec [lindex $__spec 1] \ ] - :log SPEC=[lindex $__spec 1] + #:log SPEC=[lindex $__spec 1] if {[$f istype ::xowiki::formfield::richtext] && - [my folderspec] ne ""} { + [:folderspec] ne ""} { # Insert the folder_id and the script_dir into the spec for # the oacsfs plugin to access the correct filestore instance # and to find the script directory - foreach {key value} [my folderspec] { + foreach {key value} [:folderspec] { $f $key $value } # We have to reinitialize for exporting these values asWidgetSpec @@ -126,9 +125,9 @@ } # setting form fields for later use in validator - # $data show_fields $form_fields - my set form_fields $form_fields - my set fields $__fields + # ${:data} show_fields $form_fields + set :form_fields $form_fields + set :fields $__fields } proc ::xowiki::locales {} { @@ -149,7 +148,7 @@ proc ::xowiki::page_templates {} { set form ::xowiki::f1 ;# form has to be named this way for the time being #set form [lindex [::xowiki::WikiForm info instances -closure] 0] - $form instvar data folder_id + $form instvar folder_id set q [::xowiki::PageTemplate instance_select_query \ -folder_id $folder_id \ -with_subtypes false \ @@ -330,137 +329,131 @@ # # WikiForm instproc set_form_data {} { # next - # #my msg "name in form=[my var name]" - # set name_in_form [my var name] + # #my msg "name in form=[:var name]" + # set name_in_form [:var name] # if {[regexp {^..:(.*)$} $name_in_form _ stripped_name]} { # # use stripped "name" in form to avoid possible confusions - # my var name $stripped_name + # :var name $stripped_name # } # } WikiForm instproc tidy {} { upvar #[template::adp_level] text text if {[info exists text]} { - lassign [my var text] text format + lassign [:var text] text format if {[info exists format]} { - my var text [list [list [::xowiki::tidy clean $text] $format]] + :var text [list [list [::xowiki::tidy clean $text] $format]] } } } WikiForm instproc data_from_form {{-new 0}} { - my instvar data - if {[$data exists_form_parameter text.format]} { - $data set mime_type [$data form_parameter text.format] + 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]} { - $data set publish_status production + if {$new && [[${:data} set package_id] get_parameter production_mode 0]} { + ${:data} set publish_status production } upvar #[template::adp_level] page_order page_order if {[info exists page_order] && $page_order ne ""} { set page_order [string trim $page_order " ."] } - my tidy + :tidy } WikiForm instproc update_references {} { - my instvar data folder_id - if {![my istype PageInstanceForm]} { + if {![:istype PageInstanceForm]} { ### danger: update references does an ad_eval, which breaks the [template::adp_level] ### ad_form! don't do it in pageinstanceforms. - $data render_adp false - $data render -update_references true + ${:data} render_adp false + ${:data} render -update_references true } # Delete the link cache entries for this entry. # The logic could be made more intelligent to delete entries is more rare cases, like # in case the file was renamed, but this is more bullet-proof. # # In case "ns_cache names xowiki_cache *pattern*" is not working on your installation; # upgrade ns_cache from cvs or use - # foreach entry [lsearch -inline -all [ns_cache names xowiki_cache] link-*-$folder_id] - foreach entry [ns_cache names xowiki_cache link-*-$folder_id] { + # foreach entry [lsearch -inline -all [ns_cache names xowiki_cache] link-*-${:folder_id}] + foreach entry [ns_cache names xowiki_cache link-*-${:folder_id}] { array set tmp [ns_cache get xowiki_cache $entry] - if {$tmp(item_id) == [$data set item_id]} { + if {$tmp(item_id) == [${:data} set item_id]} { ::xo::clusterwide ns_cache flush xowiki_cache $entry } } - if {![$data istype ::xowiki::Object] && - ![$data istype ::xowiki::PageTemplate] } { - if {[$data istype ::xowiki::PageInstance]} { - if {[$data set instance_attributes] ne ""} { + if {![${:data} istype ::xowiki::Object] && + ![${:data} istype ::xowiki::PageTemplate] } { + if {[${:data} istype ::xowiki::PageInstance]} { + if {[${:data} set instance_attributes] ne ""} { # fieldless page instances are not notified. problem? - # my log "--i instance_attributes = <[$data set instance_attributes]>" - ::xowiki::notification::do_notifications -page $data + # :log "--i instance_attributes = <[${:data} set instance_attributes]>" + ::xowiki::notification::do_notifications -page ${:data} } } else { - ::xowiki::notification::do_notifications -page $data + ::xowiki::notification::do_notifications -page ${:data} } } #my log "v=[ad_acs_version] 5.2] compare: [apm_version_names_compare [ad_acs_version] 5.2]" if {[apm_version_names_compare [ad_acs_version] 5.3.0d4] == 1} { application_data_link::update_links_from \ - -object_id [$data set item_id] \ - -text [$data set text] + -object_id [${:data} set item_id] \ + -text [${:data} set text] } } WikiForm instproc new_request {} { - my instvar data # # get the defaults from the slots and set it in the data. # This should not be necessary with xotocl 1.6.* # - foreach f [my field_list] { - set s [$data find_slot $f] + foreach f [:field_list] { + set s [${:data} find_slot $f] if {$s ne "" && [$s exists default] && [$s default] ne ""} { #my msg "new_request $f default = '[$s default]'" - $data set $f [$s default] + ${:data} set $f [$s default] } } # # set the following defaults manually # - $data set creator [::xo::get_user_name [::xo::cc user_id]] - if {[$data name] eq ""} { - $data set nls_language [::xo::cc locale] + ${:data} set creator [::xo::get_user_name [::xo::cc user_id]] + if {[${:data} name] eq ""} { + ${:data} set nls_language [::xo::cc locale] } next } WikiForm instproc edit_request args { - my instvar data - if {[$data set creator] eq ""} { - $data set creator [::xo::get_user_name [::xo::cc user_id]] + if {[${:data} set creator] eq ""} { + ${:data} set creator [::xo::get_user_name [::xo::cc user_id]] } next } WikiForm instproc new_data {} { - my instvar data - my data_from_form -new 1 - $data set __autoname_prefix [string range [$data set nls_language] 0 1]: + :data_from_form -new 1 + ${:data} set __autoname_prefix [string range [${:data} set nls_language] 0 1]: set item_id [next] - $data set creation_user [::xo::cc user_id] - my update_references + ${:data} set creation_user [::xo::cc user_id] + :update_references return $item_id } WikiForm instproc edit_data {} { - my data_from_form -new 0 + :data_from_form -new 0 set item_id [next] - my update_references + :update_references return $item_id } WikiForm instproc after_submit {item_id} { - set link [my submit_link] + set link [:submit_link] if {$link eq "."} { - my instvar data # we can determine submit link only after nls_langauge # is returned from the user - my submit_link [$data pretty_link] + :submit_link [${:data} pretty_link] } next } @@ -503,14 +496,13 @@ } FileForm instproc get_uploaded_file {} { - my instvar data #my log "--F... [ns_conn url] [ns_conn query] form vars = [ns_set array [ns_getform]]" - set upload_file [$data form_parameter upload_file] - # my log "--F... upload_file = $upload_file" + set upload_file [${:data} form_parameter upload_file] + # :log "--F... upload_file = $upload_file" if {$upload_file ne "" && $upload_file ne "{}"} { - $data set upload_file $upload_file - $data set import_file [$data form_parameter upload_file.tmpfile] - set mime_type [$data form_parameter upload_file.content-type] + ${:data} set upload_file $upload_file + ${:data} set import_file [${:data} form_parameter upload_file.tmpfile] + set mime_type [${:data} form_parameter upload_file.content-type] if {[::xo::dc 0or1row check_mimetype { select 1 from cr_mime_types where mime_type = :mime_type }] == 0 @@ -522,21 +514,21 @@ set mime_type $guessed_mime_type } } - $data set mime_type $mime_type - } elseif {[$data name] ne ""} { - # my log "--F no upload_file provided [lsort [$data info vars]]" - if {[$data exists mime_type]} { - my log "--mime_type=[$data set mime_type]" - #my log " text=[$data set text]" - regexp {^[^:]+:(.*)$} [$data set name] _ upload_file - $data set upload_file $upload_file - $data set import_file [$data full_file_name] - # my log "--F upload_file $upload_file import_file [$data full_file_name]" - #my log " import_type=[$data set import_file]" + ${:data} set mime_type $mime_type + } elseif {[${:data} name] ne ""} { + # :log "--F no upload_file provided [lsort [${:data} info vars]]" + if {[${:data} exists mime_type]} { + :log "--mime_type=[${:data} set mime_type]" + #my log " text=[${:data} set text]" + regexp {^[^:]+:(.*)$} [${:data} set name] _ upload_file + ${:data} set upload_file $upload_file + ${:data} set import_file [${:data} full_file_name] + # :log "--F upload_file $upload_file import_file [${:data} full_file_name]" + #my log " import_type=[${:data} set import_file]" } } else { - # my log "--F no name and no upload file" - $data set upload_file "" + # :log "--F no name and no upload file" + ${:data} set upload_file "" } } FileForm instproc new_data {} { @@ -593,24 +585,22 @@ } PodcastForm instproc new_data {} { - set pub_date [my var pub_date] - my var pub_date [list [my to_timestamp $pub_date]] + set pub_date [:var pub_date] + :var pub_date [list [:to_timestamp $pub_date]] return [next] } PodcastForm instproc edit_data {} { - set pub_date [my var pub_date] - my var pub_date [list [my to_timestamp $pub_date]] + set pub_date [:var pub_date] + :var pub_date [list [:to_timestamp $pub_date]] return [next] } PodcastForm instproc new_request {} { - my instvar data - $data set pub_date [my to_timeinfo [clock format [clock seconds] -format "%y-%m-%d %T"]] + ${:data} set pub_date [:to_timeinfo [clock format [clock seconds] -format "%y-%m-%d %T"]] next } PodcastForm instproc edit_request {item_id} { - my instvar data - $data set pub_date [my to_timeinfo [$data set pub_date]] + ${:data} set pub_date [:to_timeinfo [${:data} set pub_date]] next } @@ -626,39 +616,36 @@ } ObjectForm instproc init {} { - my instvar data - if {[$data exists name]} { + if {[${:data} exists name]} { # don't call validate on the folder object, don't let people change its name - set name [$data set name] - if {$name eq "::[$data set parent_id]"} { + set name [${:data} set name] + if {$name eq "::[${:data} set parent_id]"} { my f.name "= inform,help_text=" - my validate {{name {1} {dummy}} } - #my log "--e don't validate folder id - parent_id = [$data set parent_id]" + :validate {{name {1} {dummy}} } + #my log "--e don't validate folder id - parent_id = [${:data} set parent_id]" } } next } ObjectForm instproc new_request {} { - my instvar data permission::require_permission \ - -party_id [ad_conn user_id] -object_id [$data set parent_id] \ + -party_id [ad_conn user_id] -object_id [${:data} set parent_id] \ -privilege "admin" next } ObjectForm instproc edit_request {item_id} { - my instvar data #my f.name {{name:text {label #xowiki.Page-name#}}} permission::require_permission \ - -party_id [ad_conn user_id] -object_id [$data set parent_id] \ + -party_id [ad_conn user_id] -object_id [${:data} set parent_id] \ -privilege "admin" next } ObjectForm instproc edit_data {} { - [my data] initialize_loaded_object + [:data] initialize_loaded_object next } @@ -691,24 +678,22 @@ # nothing } PageInstanceForm instproc set_submit_link_edit {} { - my instvar folder_id data - set object_type [[$data info class] object_type] - #my log "-- data=$data cl=[$data info class] ot=$object_type" - set item_id [$data set item_id] - set page_template [$data form_parameter page_template] - if {[$data exists_query_parameter return_url]} { - set return_url [$data query_parameter return_url] + set object_type [[${:data} info class] object_type] + #my log "-- data=${:data} cl=[${:data} info class] ot=$object_type" + set item_id [${:data} set item_id] + set page_template [${:data} form_parameter page_template] + if {[${:data} exists_query_parameter return_url]} { + set return_url [${:data} query_parameter return_url] } - my submit_link [$data pretty_link -query [export_vars { + :submit_link [${:data} pretty_link -query [export_vars { {m edit} page_template return_url item_id }]] - # my log "-- submit_link = [my submit_link]" + # :log "-- submit_link = [:submit_link]" } PageInstanceForm instproc new_data {} { - my instvar data set item_id [next] - my set_submit_link_edit + :set_submit_link_edit return $item_id } @@ -731,89 +716,85 @@ } PageInstanceEditForm instproc new_data {} { - my instvar data set __vars {folder_id item_id page_template return_url} - set object_type [[$data info class] object_type] - #my log "-- cl=[[my set data] info class] ot=$object_type $__vars" - foreach __v $__vars {set $__v [$data from_parameter $__v] ""} + set object_type [[${:data} info class] object_type] + #my log "-- cl=[${:data} info class] ot=$object_type $__vars" + foreach __v $__vars {set $__v [${:data} from_parameter $__v] ""} set item_id [next] - set link [$data pretty_link] - my submit_link [export_vars -no_base_encode -base $link {{m edit} $__vars}] - # my log "-- submit_link = [my submit_link]" + set link [${:data} pretty_link] + :submit_link [export_vars -no_base_encode -base $link {{m edit} $__vars}] + # :log "-- submit_link = [:submit_link]" return $item_id } PageInstanceEditForm instproc edit_request {item_id} { - my log "-- " - my instvar page_instance_form_atts data + :log "-- " next - set __ia [$data set instance_attributes] - foreach var $page_instance_form_atts { + set __ia [${:data} set instance_attributes] + foreach var ${:page_instance_form_atts} { if {[dict exists $__ia $var]} {my var $var [list [dict get $__ia $var]]} } } PageInstanceEditForm instproc edit_data {} { - my log "-- " - my instvar page_instance_form_atts data + :log "-- " - set __ia [$data set instance_attributes] - foreach var $page_instance_form_atts { - dict set __ia $var [my var $var] + set __ia [${:data} set instance_attributes] + foreach var ${:page_instance_form_atts} { + dict set __ia $var [:var $var] } - $data set instance_attributes $__ia + ${:data} set instance_attributes $__ia set item_id [next] - my log "-- edit_data item_id=$item_id" + :log "-- edit_data item_id=$item_id" return $item_id } PageInstanceEditForm instproc init {} { - my instvar data page_instance_form_atts - set item_id [$data form_parameter item_id] + set item_id [${:data} form_parameter item_id] # # make sure to have page template object loaded # - set page_template_id [$data form_parameter page_template ""] + set page_template_id [${:data} form_parameter page_template ""] if {$page_template_id eq ""} { - set page_template_id [$data set page_template] + set page_template_id [${:data} set page_template] } set template [::xo::db::CrClass get_instance_from_db -item_id $page_template_id] - set dont_edit [concat [[$data info class] array names db_slot] \ + set dont_edit [concat [[${:data} info class] array names db_slot] \ [::xo::db::CrClass set common_query_atts]] - set category_spec [$data get_short_spec @categories] + set category_spec [${:data} get_short_spec @categories] foreach f [split $category_spec ,] { - if {$f eq "off"} {my set with_categories false} + if {$f eq "off"} {set :with_categories false} } # # compute list of form instance attributes # - set page_instance_form_atts [list] - foreach {var _} [$data template_vars [$template set text]] { - if {$var ni $dont_edit} {lappend page_instance_form_atts $var} + set :page_instance_form_atts [list] + foreach {var _} [${:data} template_vars [$template set text]] { + if {$var ni $dont_edit} {lappend :page_instance_form_atts $var} } - my set field_list [concat [my field_list_top] $page_instance_form_atts [my field_list_bottom]] + set :field_list [concat [:field_list_top] ${:page_instance_form_atts} [:field_list_bottom]] # # get widget specs from folder. # All other specs are taken form attributes or form constraints. # The widget_spec functionality might be deprecated in the future. # - foreach __var $page_instance_form_atts { - set spec [$data widget_spec_from_folder_object $__var [$template set name]] + foreach __var ${:page_instance_form_atts} { + set spec [${:data} widget_spec_from_folder_object $__var [$template set name]] if {$spec ne ""} { - my set f.$__var "$__var:$spec" + set :f.$__var "$__var:$spec" } } - my edit_page_title [$data get_from_template title] + :edit_page_title [${:data} get_from_template title] next - #my log "--fields = [my fields]" + #my log "--fields = [:fields]" } proc ::xowiki::validate_form_text {} { @@ -861,11 +842,10 @@ } FormForm instproc new_data {} { - my instvar data set item_id [next] # provide unique ids and names, if form is provided - # set form [$data set form] + # set form [${:data} set form] # if {$form ne ""} { # dom parse -simple -html [lindex $form 0] doc # $doc documentElement root @@ -877,8 +857,8 @@ # } # # updating is rather crude. we need the item_id in advance to fill it # # into the items, but it is returned from saving the file. - # my log "item_id=$item_id form=[$root asHTML] [$data serialize]" - # $data update_content [$data revision_id] [list [$root asHTML] [lindex $form 1] ] + # :log "item_id=$item_id form=[$root asHTML] [${:data} serialize]" + # ${:data} update_content [${:data} revision_id] [list [$root asHTML] [lindex $form 1] ] # } return $item_id } Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v diff -u -r1.21 -r1.22 --- openacs-4/packages/xowiki/tcl/chat-procs.tcl 1 Oct 2017 12:10:25 -0000 1.21 +++ openacs-4/packages/xowiki/tcl/chat-procs.tcl 21 Oct 2017 17:37:18 -0000 1.22 @@ -9,9 +9,9 @@ ::xo::ChatClass create Chat -superclass ::xo::Chat # Chat instproc render {} { - # my orderby time + # :orderby time # set result "" - # foreach child [my children] { + # foreach child [:children] { # set msg [$child msg] # set user_id [$child user_id] # set timelong [clock format [$child time]] @@ -25,8 +25,8 @@ # set creator "Nobody" # } # append result "$timeshort\ - # [my encode $creator]\ - # [my encode $msg]\n" + # [:encode $creator]\ + # [:encode $msg]\n" # } # return $result # } @@ -93,7 +93,7 @@ set mode streaming } } - my log "--chat mode $mode" + :log "--chat mode $mode" } # small javascript library to obtain a portable ajax request object @@ -126,7 +126,7 @@ } set file [open [acs_root_dir]/$jspath]; set js [read $file]; close $file - my log "--CHAT mode=$mode" + :log "--CHAT mode=$mode" set style { margin:1.5em 0 1.5em 0; Index: openacs-4/packages/xowiki/tcl/import-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/import-procs.tcl,v diff -u -r1.32 -r1.33 --- openacs-4/packages/xowiki/tcl/import-procs.tcl 1 Oct 2017 12:10:25 -0000 1.32 +++ openacs-4/packages/xowiki/tcl/import-procs.tcl 21 Oct 2017 17:37:40 -0000 1.33 @@ -14,12 +14,12 @@ {package_id} {parent_id} {user_id} } Importer instproc init {} { - my set log "" - my destroy_on_cleanup + set :log "" + :destroy_on_cleanup } Importer instproc report_lines {} { util_user_message -message "[_ xowiki.Import_successful]" - return "[my set log]
Details
" + return "${:log}
Details
" } Importer instproc report_line {obj operation} { set href [$obj pretty_link] @@ -30,13 +30,12 @@ "updated" { set operation "[_ xowiki.updated]" } "inherited" { set operation "[_ xowiki.inherited]" } } - my append log "$operation$name\n" + append :log "$operation$name\n" } Importer instproc report {} { - my instvar added updated replaced inherited - return "$added #xowiki.objects_newly_inserted#,\ - $updated #xowiki.objects_updated#, $replaced #xowiki.objects_replaced#, $inherited #xowiki.inherited_update_ignored#

\ - [my report_lines]" + return "${:added} #xowiki.objects_newly_inserted#,\ + ${:updated} #xowiki.objects_updated#, ${:replaced} #xowiki.objects_replaced#, ${:inherited} #xowiki.inherited_update_ignored#

\ + [:report_lines]" } Importer instproc import {-object:required -replace -create_user_ids} { @@ -45,18 +44,17 @@ # single object and inserts it (or updates it) in the database. It # takes as well care about categories. # - my instvar package_id user_id - $object demarshall -parent_id [$object parent_id] -package_id $package_id \ - -creation_user $user_id -create_user_ids $create_user_ids + $object demarshall -parent_id [$object parent_id] -package_id ${:package_id} \ + -creation_user ${:user_id} -create_user_ids $create_user_ids set item_id [::xo::db::CrClass lookup -name [$object name] -parent_id [$object parent_id]] #my msg "lookup of [$object name] parent [$object parent_id] => $item_id" if {$item_id != 0} { if {$replace} { ;# we delete the original ::xo::db::CrClass delete -item_id $item_id set item_id 0 - my report_line $object replaced - my incr replaced + :report_line $object replaced + incr :replaced } else { #my msg "$item_id update: [$object name]" ::xo::db::CrClass get_instance_from_db -item_id $item_id @@ -66,8 +64,8 @@ #my log "$item_id saved" $object set item_id [$item_id item_id] #my msg "$item_id updated: [$object name]" - my report_line $item_id updated - my incr updated + :report_line $item_id updated + incr :updated } } if {$item_id == 0} { @@ -76,8 +74,8 @@ $object set item_id $n set item_id $object #my msg "$object added: [$object name]" - my report_line $object added - my incr added + :report_line $object added + incr :added } # # The method demarshall might set the mapped __category_ids in $object. @@ -88,7 +86,7 @@ $item_id map_categories [$object set __category_ids] } - $package_id flush_references -item_id [$object item_id] -name [$object name] + ${:package_id} flush_references -item_id [$object item_id] -name [$object name] } Importer instproc import_all {-replace -objects:required {-create_user_ids 0} {-keep_inherited 1}} { @@ -126,7 +124,7 @@ # Handle import of categories in the first pass # if {[$o exists __map_command]} { - $o package_id [my package_id] + $o package_id ${:package_id} $o eval [$o set __map_command] } # FIXME remove? @@ -154,7 +152,7 @@ set old_template_id [$o page_template] if {![info exists old_names($old_template_id)]} { set new 0 - my msg "need name for $old_template_id. Maybe item_ids for PageTemplate missing?" + :msg "need name for $old_template_id. Maybe item_ids for PageTemplate missing?" break } @@ -185,7 +183,7 @@ && [$o exists __export_reason] && [$o set __export_reason] eq "implicit_page_template"} { $o unset __export_reason - set page [[my package_id] get_page_from_item_ref \ + set page [${:package_id} get_page_from_item_ref \ -allow_cross_package_item_refs false \ -use_package_path true \ -use_site_wide_pages true \ @@ -199,8 +197,8 @@ # set inherited [expr {[$page physical_parent_id] ne [$page parent_id]}] if {$page ne ""} { - #my msg "page [$o name] can ne found in folder [my parent_id]" - my incr inherited + #my msg "page [$o name] can ne found in folder ${:parent_id}" + incr :inherited unset todo($o) set o $page set need_to_import 0 @@ -216,23 +214,23 @@ if {[$o istype ::xowiki::PageInstance]} { #my msg "importing [$o name] page_instance, map $template_name_key to $name_map($template_name_key)" $o page_template $name_map($template_name_key) - #my msg "exists template? [my isobject [$o page_template]]" - if {![my isobject [$o page_template]]} { + #my msg "exists template? [:isobject [$o page_template]]" + if {![:isobject [$o page_template]]} { ::xo::db::CrClass get_instance_from_db -item_id [$o page_template] - #my msg "[my isobject [$o page_template]] loaded" + #my msg "[:isobject [$o page_template]] loaded" } } if {[info exists item_ids($old_parent_id)]} { $o set parent_id $id_map($old_parent_id) } else { - $o set parent_id [my parent_id] + $o set parent_id ${:parent_id} } # Everything is mapped, we can now do the import. #my msg "start import for $o, name=[$o name]" - my import \ + :import \ -object $o \ -replace $replace \ -create_user_ids $create_user_ids @@ -253,7 +251,7 @@ set new 1 } if {$new == 0} { - my msg "could not import [array names todo]" + :msg "could not import [array names todo]" break } } @@ -264,7 +262,7 @@ # foreach o $objects {$o destroy} - [my package_id] flush_page_fragment_cache + ${:package_id} flush_page_fragment_cache } # @@ -278,7 +276,7 @@ # foreach item_id $item_ids { if {[::xo::db::CrClass get_instance_from_db -item_id $item_id] eq ""} { - my log "Warning: cannot fetch item $item_id for exporting" + :log "Warning: cannot fetch item $item_id for exporting" } else { set items($item_id) 1 } @@ -345,7 +343,7 @@ # # include implictely needed objects, instantiate the objects. # - set item_ids [my include_needed_objects $item_ids] + set item_ids [:include_needed_objects $item_ids] # # stream the objects via ns_write # @@ -379,40 +377,39 @@ {use_photo_form false} } ArchiveFile instproc init {} { - my destroy_on_cleanup - ::xo::db::CrClass get_instance_from_db -item_id [my parent_id] - my set tmpdir [ad_tmpnam] - file mkdir [my set tmpdir] + :destroy_on_cleanup + ::xo::db::CrClass get_instance_from_db -item_id ${:parent_id} + set :tmpdir [ad_tmpnam] + file mkdir ${:tmpdir} } ArchiveFile instproc delete {} { - file delete -force -- [my set tmpdir] + file delete -force -- ${:tmpdir} next } ArchiveFile instproc unpack {} { - my instvar name file set success 0 - #my log "::xowiki::guesstype '$name' => [::xowiki::guesstype $name]" - switch [::xowiki::guesstype $name] { + #my log "::xowiki::guesstype '${:name}' => [::xowiki::guesstype ${:name}]" + switch [::xowiki::guesstype ${:name}] { application/zip - application/x-zip - application/x-zip-compressed { set zipcmd [::util::which unzip] - #my msg "zip = $zipcmd, tempdir = [my set tmpdir]" - exec $zipcmd $file -d [my set tmpdir] - my import -dir [my set tmpdir] -parent_id [my parent_id] + #my msg "zip = $zipcmd, tempdir = ${:tmpdir}" + exec $zipcmd ${:file} -d ${:tmpdir} + :import -dir ${:tmpdir} -parent_id ${:parent_id} set success 1 } application/x-compressed { - if {[string match "*tar.gz" $name]} { + if {[string match "*tar.gz" ${:name}]} { set cmd [::util::which tar] - exec $cmd -xzf $file -C [my set tmpdir] - my import -dir [my set tmpdir] -parent_id [my parent_id] + exec $cmd -xzf ${:file} -C ${:tmpdir} + :import -dir ${:tmpdir} -parent_id ${:parent_id} set success 1 } else { - my msg "unknown compressed file type $name" + :msg "unknown compressed file type ${:name}" } } - default {my msg "type [::xowiki::guesstype $name] of $name unknown"} + default {my msg "type [::xowiki::guesstype ${:name}] of ${:name} unknown"} } #my msg success=$success return $success @@ -446,14 +443,14 @@ # ..... and refetch it under its canonical name ::xo::db::CrClass get_instance_from_db -item_id [$folder_object item_id] } - my import -dir $tmpfile -parent_id [$folder_object item_id] + :import -dir $tmpfile -parent_id [$folder_object item_id] } else { set mime_type [::xowiki::guesstype $file_name] - if {[string match "image/*" $mime_type] && [my use_photo_form]} { + if {[string match "image/*" $mime_type] && [:use_photo_form]} { set photo_object [$package_id get_page_from_name -name en:$file_name -parent_id $parent_id] if {$photo_object ne ""} { # photo entry exists already, create a new revision - my log "Photo $file_name exists already" + :log "Photo $file_name exists already" $photo_object set title $file_name set f [::xowiki::formfield::file new -object $photo_object -name "image" -destroy_on_cleanup] $f set value $file_name @@ -463,7 +460,7 @@ $photo_object save } else { # create a new photo entry - my log "new Photo $file_name" + :log "new Photo $file_name" set photoFormObj [::xowiki::Weblog instantiate_forms \ -parent_id $parent_id -forms en:photo.form -package_id $package_id] set photo_object [$photoFormObj create_form_page_instance \ @@ -486,14 +483,14 @@ } else { set file_object [$package_id get_page_from_name -name file:$file_name -parent_id $parent_id] if {$file_object ne ""} { - my msg "file $file_name exists already" + :msg "file $file_name exists already" # file entry exists already, create a new revision $file_object set import_file $tmpfile $file_object set mime_type $mime_type $file_object set title $file_name $file_object save } else { - my msg "file $file_name created new" + :msg "file $file_name created new" set file_object [::xowiki::File new -destroy_on_cleanup \ -title $file_name \ -name file:$file_name \ 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.207 -r1.208 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 1 Oct 2017 12:10:25 -0000 1.207 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 21 Oct 2017 17:39:03 -0000 1.208 @@ -76,16 +76,16 @@ } } append result "}}\n" - my set html([namespace tail $cl]) $result - my describe_includelets [$cl info subclass] + set :html([namespace tail $cl]) $result + :describe_includelets [$cl info subclass] } } ::xowiki::Includelet proc available_includelets {} { - if {[my array exists html]} {my array unset html} - my describe_includelets [::xowiki::Includelet info subclass] + if {[array exists :html]} {my array unset html} + :describe_includelets [::xowiki::Includelet info subclass] set result "

" return $result @@ -322,7 +322,7 @@ # denoted by source # if {[info exists source]} { - set p [my resolve_page_name $source] + set p [:resolve_page_name $source] if {$p ne ""} { array set ia [$p set instance_attributes] if {[info exists ia(pages)]} { @@ -376,7 +376,7 @@ } available-includelets instproc render {} { - my get_parameters + :get_parameters return [::xowiki::Includelet available_includelets] } } @@ -396,15 +396,15 @@ # - personalized (dependency on userid) # Class create ::xowiki::includelet::page_fragment_cache -instproc render {} { - set c [my info class] + set c [:info class] # # Construct a key based on the class parameters and the # actual parameters # - set key "PF-[my package_id]-" + set key "PF-${:package_id}-" append key [expr {[$c aggregating] ? "agg" : "ind"}] - append key "-$c [my set __caller_parameters]" - if {[$c localized]} {append key -[my locale]} + append key "-$c ${:__caller_parameters}" + if {[$c localized]} {append key -[:locale]} if {[$c personalized]} {append key -[::xo::cc user_id]} # # Get the HTML from the rendered includelet by calling "next" @@ -418,7 +418,7 @@ # it. # if {[catch {set data [ns_cache get xowiki_cache $key-data]}]} { - my cache_includelet_data $key-data + :cache_includelet_data $key-data } else { #my msg "eval $data" {*}$data @@ -437,9 +437,9 @@ Class create ::xowiki::includelet::decoration=portlet -instproc render {} { set name ${:name} set title ${:title} - set package_id [:package_id] - set class [namespace tail [my info class]] - set id [expr {[my exists id] ? "id='[my id]'" : ""}] + set package_id ${:package_id} + set class [namespace tail [:info class]] + set id [expr {[info exists :id] ? "id='[:id]'" : ""}] set html [next] set localized_title [::xo::localize $title] set link [expr {[string match "*:*" $name] ? @@ -458,12 +458,12 @@ Class create ::xowiki::includelet::decoration=edit -instproc render {} { set name ${:name} set title ${:title} - set package_id [:package_id] - set class [namespace tail [my info class]] - set id [expr {[my exists id] ? "id='[my id]'" : ""}] + set package_id ${:package_id} + set class [namespace tail [:info class]] + set id [expr {[info exists :id] ? "id='[:id]'" : ""}] set html [next] set localized_title [::xo::localize $title] - set edit_button [my include [list edit-item-button -book_mode true]] + set edit_button [:include [list edit-item-button -book_mode true]] set link [expr {[string match "*:*" $name] ? "[ns_quotehtml $localized_title]" : $localized_title}] @@ -474,14 +474,14 @@ } Class create ::xowiki::includelet::decoration=plain -instproc render {} { - set class [namespace tail [my info class]] - set id [expr {[my exists id] ? "id='[my id]'" : ""}] + set class [namespace tail [:info class]] + set id [expr {[info exists :id] ? "id='[:id]'" : ""}] return "
[next]
" } Class create ::xowiki::includelet::decoration=rightbox -instproc render {} { - set class [namespace tail [my info class]] - set id [expr {[my exists id] ? "id='[my id]'" : ""}] + set class [namespace tail [:info class]] + set id [expr {[info exists :id] ? "id='[:id]'" : ""}] return "
[next]
" } } @@ -498,11 +498,11 @@ {-source ""} }} } -instproc render {} { - my get_parameters + :get_parameters if {![info exists variable] && ![info exists form_variable]} { return "either -variable or -form_variable must be specified" } - set page [my resolve_page_name $source] + set page [:resolve_page_name $source] if {[info exists variable] && [$page exists $variable]} { return [$page set $variable] @@ -528,11 +528,11 @@ {-format "%m-%d-%Y"} }} } -instproc render {} { - my get_parameters - set page [my resolve_page_name $source] + :get_parameters + set page [:resolve_page_name $source] set time [$page set creation_date] regexp {^([^.]+)[.]} $time _ time - return [lc_time_fmt [clock format [clock scan $time] -format "%Y-%m-%d %H:%M:%S"] $format [my locale]] + return [lc_time_fmt [clock format [clock scan $time] -format "%Y-%m-%d %H:%M:%S"] $format [:locale]] #return [clock format [clock scan $time] -format $format] } @@ -552,7 +552,7 @@ } rss-button instproc render {} { - my get_parameters + :get_parameters set parent_ids [${:__including_page} parent_id] set href [export_vars -base [$package_id package_url] {{rss $span} parent_ids name_filter title entries_of}] ::xo::Page requireLink -rel alternate -type application/rss+xml -title RSS -href $href @@ -573,14 +573,14 @@ } bookmarklet-button instproc render {} { - my get_parameters + :get_parameters set parent_id [${:__including_page} parent_id] set url [$package_id pretty_link -absolute 1 -siteurl $siteurl -parent_id $parent_id news-item] if {$label eq ""} {set label "Add to [$package_id instance_name]"} - if {![my exists id]} {my set id [::xowiki::Includelet html_id [self]]} + if {![info exists :id]} {set :id [::xowiki::Includelet html_id [self]]} template::add_event_listener \ - -id [my id] \ + -id [:id] \ -script [subst { d=document;w=window;t=''; if(d.selection){t=d.selection.createRange().text;} @@ -591,7 +591,7 @@ 'scrollbars=yes,width=700,height=575,status=yes,resizable=yes,scrollbars=yes')); }] - return "[ns_quotehtml $label]" + return "[ns_quotehtml $label]" } ############################################################################# @@ -602,8 +602,8 @@ -parameter {{__decoration none}} set-parameter instproc render {} { - my get_parameters - set pl [my set __caller_parameters] + :get_parameters + set pl ${:__caller_parameters} if {[llength $pl] % 2 == 1} { error "no even number of parameters '$pl'" } @@ -646,15 +646,15 @@ } categories instproc initialize {} { - my get_parameters + :get_parameters if {!$tree_style} { set style sections } - my set style $style + set :style $style } categories instproc include_head_entries {} { - ::xowiki::Tree include_head_entries -renderer [my set style] + ::xowiki::Tree include_head_entries -renderer ${:style} } categories instproc category_tree_edit_button {-object_id:integer -locale {-allow_edit false} -tree_id:integer} { @@ -664,14 +664,14 @@ # # If a tree_id is given, edit directly the category tree ... # - set href "[[my package_id] package_url]?edit-category-tree&object_id=$object_id&tree_id=$tree_id" + set href "[${:package_id} package_url]?edit-category-tree&object_id=$object_id&tree_id=$tree_id" return [${:__including_page} include \ [list edit-item-button -link $href -title [_ xowiki.Edit_category] -target _blank]] } else { # # ... otherwise, manage categories (allow defining new category trees, map/unmap, etc.) # - set href "[[my package_id] package_url]?manage-categories&object_id=$object_id" + set href "[${:package_id} package_url]?manage-categories&object_id=$object_id" return [${:__including_page} include \ [list edit-item-button -link $href -title [_ xowiki.Manage_categories] -target _blank]] } @@ -688,7 +688,7 @@ } else { set msg "No category tree with name '$name' found." } - [my package_id] flush_page_fragment_cache -scope agg + ${:package_id} flush_page_fragment_cache -scope agg set html "
[ns_quotehtml $msg]
" if {$edit_html ne ""} { return "$html Manage Categories? $edit_html" @@ -697,7 +697,7 @@ } categories instproc render {} { - my get_parameters + :get_parameters set content "" set folder_id [$package_id folder_id] @@ -724,17 +724,17 @@ } } - set edit_html [my category_tree_edit_button -object_id $package_id -allow_edit $allow_edit] + set edit_html [:category_tree_edit_button -object_id $package_id -allow_edit $allow_edit] if {[llength $trees] == 0} { - return [my category_tree_missing -name $tree_name -edit_html $edit_html] + return [:category_tree_missing -name $tree_name -edit_html $edit_html] } - if {![my exists id]} {my set id [::xowiki::Includelet html_id [self]]} + if {![info exists :id]} {set :id [::xowiki::Includelet html_id [self]]} foreach tree $trees { lassign $tree tree_id my_tree_name ... - set edit_html [my category_tree_edit_button -object_id $package_id \ + set edit_html [:category_tree_edit_button -object_id $package_id \ -allow_edit $allow_edit -tree_id $tree_id] #append content "
$edit_html
\n" @@ -746,7 +746,7 @@ set categories [list] set pos 0 set cattree(0) [::xowiki::Tree new -volatile -orderby pos \ - -id [my id]-$my_tree_name -name $my_tree_name] + -id [:id]-$my_tree_name -name $my_tree_name] set category_infos [::xowiki::Category get_category_infos \ -locale $locale -tree_id $tree_id] @@ -830,7 +830,7 @@ $category($category_id) href [ad_conn url]?category_id=$category_id$s $category($category_id) open_tree } - append content [$cattree(0) render -style [my set style]] + append content [$cattree(0) render -style ${:style}] } else { lassign [split $order_items_by ,] orderby direction ;# e.g. "title,asc" set increasing [expr {$direction ne "desc"}] @@ -851,7 +851,7 @@ -increasing $increasing \ -open_item [expr {$item_id == $open_item_id}] } - append content [$cattree(0) render -style [my set style]] + append content [$cattree(0) render -style ${:style}] } } return $content @@ -883,26 +883,26 @@ } categories-recent instproc initialize {} { - my set style sections + set :style sections # When pretty age is activated, this includedlet is not suited for # caching (it could make sense e.g. when the age granularity is 1 # minute or more). This measure here (turing off caching # completely) is a little bit too much, but it is safe. - my get_parameters - if {[[my info class] cacheable] && $pretty_age ne "off"} { - [my info class] cacheable false + :get_parameters + if {[[:info class] cacheable] && $pretty_age ne "off"} { + [:info class] cacheable false } } categories-recent instproc include_head_entries {} { - ::xowiki::Tree include_head_entries -renderer [my set style] + ::xowiki::Tree include_head_entries -renderer ${:style} } categories-recent instproc render {} { - my get_parameters + :get_parameters - if {![my exists id]} {my set id [::xowiki::Includelet html_id [self]]} - set cattree [::xowiki::Tree new -volatile -id [my id]] + if {![info exists :id]} {set :id [::xowiki::Includelet html_id [self]]} + set cattree [::xowiki::Tree new -volatile -id [:id]] lassign [::xowiki::Includelet locale_clause -revisions r -items ci $package_id $locale] \ locale locale_clause @@ -931,8 +931,8 @@ set prefix "" set suffix "" switch -- $pretty_age { - 1 {set suffix " ([::xowiki::utility pretty_age -timestamp [clock scan $formatted_date] -locale [my locale]])"} - 2 {set suffix "([::xowiki::utility pretty_age -timestamp [clock scan $formatted_date] -locale [my locale] -levels 2])"} + 1 {set suffix " ([::xowiki::utility pretty_age -timestamp [clock scan $formatted_date] -locale [:locale]])"} + 2 {set suffix "([::xowiki::utility pretty_age -timestamp [clock scan $formatted_date] -locale [:locale] -levels 2])"} default {set prefix "$formatted_date "} } if {$prefix ne ""} {set prefix "$prefix";$itemobj set encoded(prefix) 1} @@ -948,7 +948,7 @@ } $cattree add_item -category $categories($category_id) -itemobj $itemobj } - return [$cattree render -style [my set style]] + return [$cattree render -style ${:style}] } } @@ -972,7 +972,7 @@ } recent instproc render {} { - my get_parameters + :get_parameters ::xo::Page requireCSS "/resources/acs-templating/lists.css" set admin_p [::xo::cc permission -object_id $package_id -privilege admin \ -party_id [::xo::cc set untrusted_user_id]] @@ -984,14 +984,14 @@ -set show_heritage $admin_p \ -columns { Field create date -label [_ xowiki.Page-last_modified] - if {[[my info parent] set allow_edit]} { + if {[[:info parent] set allow_edit]} { AnchorField create edit -CSSclass edit-item-button -label "" -html {style "padding-right: 2px;"} -richtext 1 } - if {[[my info parent] set show_heritage]} { + if {[[:info parent] set show_heritage]} { AnchorField create inherited -label "" -CSSclass inherited } AnchorField create title -label [::xowiki::Page::slot::title set pretty_name] - if {[[my info parent] set allow_delete]} { + if {[[:info parent] set allow_delete]} { AnchorField create delete -CSSclass delete-item-button -label "" -richtext 1 } } @@ -1006,8 +1006,8 @@ set page_link [$entry_package_id pretty_link -parent_id $parent_id $entry_name] switch -- $pretty_age { - 1 {set age [::xowiki::utility pretty_age -timestamp [clock scan $formatted_date] -locale [my locale]]} - 2 {set age [::xowiki::utility pretty_age -timestamp [clock scan $formatted_date] -locale [my locale] -levels 2]} + 1 {set age [::xowiki::utility pretty_age -timestamp [clock scan $formatted_date] -locale [:locale]]} + 2 {set age [::xowiki::utility pretty_age -timestamp [clock scan $formatted_date] -locale [:locale] -levels 2]} default {set age $formatted_date} } @@ -1032,7 +1032,7 @@ [t1 last_child] set delete " " } if {$show_heritage} { - if {$entry_package_id == [my package_id]} { + if {$entry_package_id == ${:package_id}} { set href "" set title "" set alt "" @@ -1072,7 +1072,7 @@ } last-visited instproc render {} { - my get_parameters + :get_parameters ::xo::Page requireCSS "/resources/acs-templating/lists.css" TableWidget create t1 -volatile \ @@ -1116,7 +1116,7 @@ } most-popular instproc render {} { - my get_parameters + :get_parameters ::xo::Page requireCSS "/resources/acs-templating/lists.css" if {[info exists interval]} { @@ -1125,7 +1125,7 @@ # for that interval, since we have only the aggregated values in # the database. # - my append title " in last $interval" + append :title " in last $interval" TableWidget create t1 -volatile \ -columns { @@ -1193,15 +1193,15 @@ } rss-client instproc initialize {} { - my get_parameters + :get_parameters set :feed [::xowiki::RSS-client new -url $url -destroy_on_cleanup] if {[info commands [${:feed} channel]] ne ""} { - my title [ [${:feed} channel] title] + :title [ [${:feed} channel] title] } } rss-client instproc render {} { - my get_parameters + :get_parameters if {[info commands [${:feed} channel]] eq ""} { set detail "" if {[${:feed} exists errorMessage]} {set detail \n[${:feed} set errorMessage]} @@ -1238,7 +1238,7 @@ } most-frequent-visitors instproc render {} { - my get_parameters + :get_parameters ::xo::Page requireCSS "/resources/acs-templating/lists.css" TableWidget create t1 -volatile \ @@ -1285,7 +1285,7 @@ } unread-items instproc render {} { - my get_parameters + :get_parameters ::xo::Page requireCSS "/resources/acs-templating/lists.css" TableWidget create t1 -volatile \ @@ -1351,7 +1351,7 @@ } tags instproc render {} { - my get_parameters + :get_parameters ::xo::Page requireCSS "/resources/acs-templating/lists.css" if {$popular} { @@ -1400,7 +1400,7 @@ } my-tags instproc render {} { - my get_parameters + :get_parameters ::xo::Page requireJS "/resources/xowiki/get-http-object.js" set p_link [${:__including_page} pretty_link] @@ -1456,7 +1456,7 @@ } my-categories instproc render {} { - my get_parameters + :get_parameters set content "" set weblog_page [$package_id get_parameter weblog_page weblog] @@ -1505,7 +1505,7 @@ -parameter {{__decoration none}} my-general-comments instproc render {} { - my get_parameters + :get_parameters set item_id [${:__including_page} item_id] set gc_return_url [$package_id url] # @@ -1540,7 +1540,7 @@ } digg instproc render {} { - my get_parameters + :get_parameters set digg_link [export_vars -base "http://digg.com/submit" { {phase 2} {url $url} @@ -1562,7 +1562,7 @@ } delicious instproc render {} { - my get_parameters + :get_parameters # the following opens a window, where a user can edit the posted info. # however, it seems not possible to add tags this way automatically. @@ -1592,7 +1592,7 @@ } my-yahoo-publisher instproc render {} { - my get_parameters + :get_parameters set publisher [ad_urlencode $publisher] set feedname [ad_urlencode [$package_id get_parameter PackageTitle [$package_id instance_name]]] @@ -1612,7 +1612,7 @@ -parameter {{__decoration none}} my-references instproc render {} { - my get_parameters + :get_parameters set item_id [${:__including_page} item_id] set refs [list] @@ -1660,7 +1660,7 @@ -parameter {{__decoration none}} my-refers instproc render {} { - my get_parameters + :get_parameters set item_id [${:__including_page} item_id] set refs [list] @@ -1716,7 +1716,7 @@ # TODO make display style -decoration presence instproc render {} { - my get_parameters + :get_parameters set summary 0 if {[::xo::cc user_id] == 0} { @@ -1818,10 +1818,10 @@ } PageReorderSupport instproc page_reorder_init_vars {-allow_reorder js_ last_level_ ID_ min_level_} { - my upvar $js_ js $last_level_ last_level $ID_ ID $min_level_ min_level - set js "YAHOO.xo_page_order_region.DDApp.package_url = '[[my package_id] package_url]';\n" + :upvar $js_ js $last_level_ last_level $ID_ ID $min_level_ min_level + set js "YAHOO.xo_page_order_region.DDApp.package_url = '[${:package_id} package_url]';\n" set last_level 0 - set ID [my js_name] + set ID [:js_name] if {[string is integer -strict $allow_reorder]} { set min_level $allow_reorder } else { @@ -1835,9 +1835,9 @@ return "\n" } for {set l $last_level} {$l < $level} {incr l} { regsub -all {[.]} $prefix _ prefix_js - append output [my page_reorder_open_ul -min_level $min_level -ID $ID -prefix_js $prefix_js $l] + append output [:page_reorder_open_ul -min_level $min_level -ID $ID -prefix_js $prefix_js $l] } set last_level $level set last_prefix $prefix } # Pass the page_order for the element to javascript and add # the li element for the section. - set item_id [my page_reorder_item_id -ID $ID -prefix_js $prefix_js -page_order $page_order js] + set item_id [:page_reorder_item_id -ID $ID -prefix_js $prefix_js -page_order $page_order js] append output "
  • " } @@ -2541,7 +2541,7 @@ } } - append output [my render_item \ + append output [:render_item \ -menu_buttons $menu_buttons \ -content $content \ -object $p \ @@ -2578,17 +2578,17 @@ } book instproc render {} { - my get_parameters + :get_parameters lappend ::xowiki_page_item_id_rendered [${:__including_page} item_id] ${:__including_page} set __is_book_page 1 - set allow_reorder [my page_reorder_check_allow $allow_reorder] + set allow_reorder [:page_reorder_check_allow $allow_reorder] set extra_where_clause "" set cnames "" if {[info exists category_id]} { - lassign [my category_clause $category_id] cnames extra_where_clause + lassign [:category_clause $category_id] cnames extra_where_clause } lassign [::xowiki::Includelet locale_clause -revisions p -items p $package_id $locale] \ @@ -2632,7 +2632,7 @@ set p [::xo::db::CrClass get_instance_from_db -item_id $parent_id] set output "

    No pages with parent object [$p name], page_order not NULL and an appropriate publish status found

    \n" } else { - set output [my render_items \ + set output [:render_items \ -menu_buttons $menu_buttons \ -with_footer $with_footer \ -pages $pages \ @@ -2701,10 +2701,10 @@ error "ignoring cnames, allow_reorder, and with_footer for the time being" } - set id [my js_name] + set id [:js_name] append output \ "
    \n" ::xo::Page requireJS "/resources/xowiki/jquery/jquery.min.js" @@ -2754,10 +2754,10 @@ error "ignoring cnames, allow_reorder, and with_footer for the time being" } - set id [my js_name] + set id [:js_name] append output \ "
    \n" ::xo::Page requireJS "/resources/xowiki/jquery/jquery.min.js" @@ -2813,10 +2813,10 @@ error "ignoring cnames, allow_reorder, and with_footer for the time being" } - set id [my js_name] + set id [:js_name] append output \ "
    " \ - [join [my render_images -addClass cloudcarousel $pages] "\n"] \ + [join [:render_images -addClass cloudcarousel $pages] "\n"] \ "
    \n" ::xo::Page requireStyle "div.jquery-cloud-carousel div {width:650px; height:400px;background:#000;}" @@ -2890,10 +2890,10 @@ error "ignoring cnames, allow_reorder, and with_footer for the time being" } - set id [my js_name] + set id [:js_name] append output \ "
    \n" \ - [join [my render_images $pages] "\n"] \ + [join [:render_images $pages] "\n"] \ "
    \n" ::xo::Page requireStyle "div.spacegallery {width:600px; height:450px;}" @@ -2924,7 +2924,7 @@ } item-button instproc initialize {} { - if {[my return_url] eq "" } { my return_url [[my package_id] url]} + if {[:return_url] eq "" } { :return_url [${:package_id} url]} } item-button instproc render_button { @@ -2954,7 +2954,7 @@ } } if {$link ne ""} { - set button_class [namespace tail [my info class]] + set button_class [namespace tail [:info class]] set props "" if {$alt ne ""} {append props "alt=\"[ns_quotehtml $alt]\" "} if {$title ne ""} {append props "title=\"[ns_quotehtml $title]\" "} @@ -2977,7 +2977,7 @@ } edit-item-button instproc render {} { - my get_parameters + :get_parameters set page [expr {[info exists page_id] ? $page_id : ${:__including_page}}] if {[$page istype ::xowiki::FormPage]} { set template [$page page_template] @@ -2987,7 +2987,7 @@ if {$book_mode} { append :return_url #[toc anchor [$page name]] } - return [my render_button \ + return [:render_button \ -page $page -method edit -package_id $package_id -link $link \ -title $title -alt $alt -return_url ${:return_url} -target $target] } @@ -3005,9 +3005,9 @@ } delete-item-button instproc render {} { - my get_parameters + :get_parameters set page [expr {[info exists page_id] ? $page_id : ${:__including_page}}] - return [my render_button \ + return [:render_button \ -page $page -method delete -package_id $package_id \ -title $title -alt $alt \ -return_url ${:return_url}] @@ -3027,9 +3027,9 @@ } view-item-button instproc render {} { - my get_parameters + :get_parameters set page [expr {[info exists page_id] ? $page_id : ${:__including_page}}] - return [my render_button \ + return [:render_button \ -page $page -method view -package_id $package_id \ -link $link -title $title -alt $alt \ -return_url ${:return_url}] @@ -3048,19 +3048,19 @@ } create-item-button instproc render {} { - my get_parameters + :get_parameters set page [expr {[info exists page_id] ? $page_id : ${:__including_page}}] set page_order [::xowiki::utility incr_page_order [$page page_order]] if {[$page istype ::xowiki::FormPage]} { set template [$page page_template] - return [my render_button \ + return [:render_button \ -page $template -method create-new -package_id $package_id \ -title [_ xowiki.create_new_entry_of_type [list type [$template title]]] \ -alt $alt -page_order $page_order \ -return_url ${:return_url}] } else { set object_type [${:__including_page} info class] - return [my render_button \ + return [:render_button \ -page $package_id -method edit_new -package_id $package_id \ -title [_ xowiki.create_new_entry_of_type [list type $object_type]] \ -alt $alt -page_order $page_order \ @@ -3080,19 +3080,19 @@ } copy-item-button instproc render {} { - my get_parameters + :get_parameters set page [expr {[info exists page_id] ? $page_id : ${:__including_page}}] if {[$page istype ::xowiki::FormPage]} { set template [$page page_template] - return [my render_button \ + return [:render_button \ -page $template -method create-new -package_id $package_id \ -title [_ xowiki.copy_entry [list type [$template title]]] \ -alt $alt -source_item_id [$page item_id] \ -return_url ${:return_url}] } else { set object_type [${:__including_page} info class] - return [my render_button \ + return [:render_button \ -page $package_id -method edit_new -package_id $package_id \ -title [_ xowiki.copy_entry [list type $object_type]] \ -alt $alt -source_item_id [$page item_id] \ @@ -3185,7 +3185,7 @@ } collab-graph instproc render {} { - my get_parameters + :get_parameters if {$show_anonymous ne "all" && [::xo::cc user_id] eq "0"} { return "You must login to see the [namespace tail [self class]]" @@ -3245,7 +3245,7 @@ } append result "($activities($user_id) contributions)

    \n" - append result [my graphHTML \ + append result [:graphHTML \ -nodes [array get user] -edges $edges \ -max_edges $max_edges -cutoff $cutoff \ -base collab -attrib user_id] @@ -3268,7 +3268,7 @@ activity-graph instproc render {} { - my get_parameters + :get_parameters if {$show_anonymous ne "all" && [::xo::cc user_id] eq "0"} { return "You must login to see the [namespace tail [self class]]" @@ -3336,7 +3336,7 @@ lappend edges [list $x $collab($x) [expr {$collab($x)*5.0/$max}]] } - append result [my graphHTML \ + append result [:graphHTML \ -nodes [array get user] -edges $edges \ -max_edges $max_edges -cutoff $cutoff \ -base collab -attrib user_id] @@ -3357,7 +3357,7 @@ } timeline instproc render {} { - my get_parameters + :get_parameters ::xo::Page requireJS "/resources/ajaxhelper/yui/yahoo/yahoo.js" ::xo::Page requireJS "/resources/ajaxhelper/yui/event/event.js" @@ -3430,7 +3430,7 @@ } user-timeline instproc render {} { - my get_parameters + :get_parameters if {![info exists user_id]} {set user_id [::xo::cc user_id]]} ::xo::cc set_parameter user_id $user_id next @@ -3454,17 +3454,17 @@ } form-menu-button instproc render {} { - my instvar return_url if {![info exists :link]} { - if {[my parent_id] != [${:package_id} folder_id]} { - set parent_id [my parent_id] + if {${:parent_id} != [${:package_id} folder_id]} { + set parent_id ${:parent_id} } + set return_url ${:return_url} set :link [${:package_id} make_link -link ${:base} ${:form} ${:method} return_url parent_id] } if {${:link} eq ""} { return "" } - set msg_key [namespace tail [my info class]] + set msg_key [namespace tail [:info class]] set label [_ xowiki.$msg_key [list form_name [${:form} name]]]${:label_suffix} return "[ns_quotehtml $label]" } @@ -3480,11 +3480,11 @@ array set "" [list publish_status all] array set "" [::xowiki::PageInstance get_list_from_form_constraints \ -name @table_properties \ - -form_constraints [[my form] get_form_constraints -trylocal true]] - set count [[my form] count_usages \ - -package_id [my package_id] -parent_id [my parent_id] \ + -form_constraints [[:form] get_form_constraints -trylocal true]] + set count [[:form] count_usages \ + -package_id ${:package_id} -parent_id ${:parent_id} \ -publish_status $(publish_status)] - my label_suffix " ($count)" + :label_suffix " ($count)" next } @@ -3508,7 +3508,7 @@ } form-menu instproc render {} { - my get_parameters + :get_parameters #my msg form-menu-[info exists form_item_id] buttons=$buttons if {![info exists form_item_id]} { set form_item_id [::xowiki::Weblog instantiate_forms \ @@ -3517,7 +3517,7 @@ -package_id [${:__including_page} package_id]] if {$form_item_id eq ""} { # we could throw an error as well... - my msg "could not locate form '$form' for parent_id [${:__including_page} parent_id]" + :msg "could not locate form '$form' for parent_id [${:__including_page} parent_id]" return "" } } @@ -3580,7 +3580,7 @@ } form-stats instproc render {} { - my get_parameters + :get_parameters set o ${:__including_page} if {![info exists parent_id]} {set parent_id [$o parent_id]} set form_item_ids [::xowiki::Weblog instantiate_forms \ @@ -3622,7 +3622,7 @@ foreach {value count} [array get __count] { lappend percentages $value [format %.2f [expr {$count*100.0/$sum}]] } - set h [highcharts new -volatile -id [my js_name] \ + set h [highcharts new -volatile -id [:js_name] \ -title [::xowiki::Includelet js_encode \ "$sum $total_text [_ xowiki.Answers_for_Survey] '[$form_item_ids title]'"]] return [$h pie [list value count] $percentages] @@ -3656,10 +3656,10 @@ ::xo::Page requireJS "/resources/xowiki/jquery/jquery.min.js" ::xo::Page requireJS "/resources/xowiki/highcharts/js/highcharts.js" ::xo::Page requireJS "/resources/xowiki/highcharts/js/themes/gray.js" - set result "
    \n" - set title [my title] - if {![my exists id]} {my set id [::xowiki::Includelet html_id [self]]} - set id [my id] + set result "
    \n" + set title [:title] + if {![info exists :id]} {set :id [::xowiki::Includelet html_id [self]]} + set id [:id] set values [list] foreach {name value} $data { lappend values "\['[::xowiki::Includelet js_encode $name]', $value\]" @@ -3746,7 +3746,7 @@ # {-renderer "YUIDataTableRenderer"} form-usages instproc render {} { - my get_parameters + :get_parameters set o ${:__including_page} ::xo::Page requireCSS "/resources/acs-templating/lists.css" @@ -3961,7 +3961,7 @@ #my log "exists category_id [info exists category_id]" set extra_where_clause "" if {[info exists category_id]} { - lassign [my category_clause $category_id item_id] cnames extra_where_clause + lassign [:category_clause $category_id item_id] cnames extra_where_clause } set items [::xowiki::FormPage get_form_entries \ @@ -4074,7 +4074,7 @@ if {$generate eq "csv"} { return [t1 write_csv] } elseif {$generate eq "voting_form"} { - return [my generate_voting_form $voting_form $voting_form_form t1 $field_names $voting_form_anon_instances] + return [:generate_voting_form $voting_form $voting_form_form t1 $field_names $voting_form_anon_instances] } } return "" @@ -4145,18 +4145,18 @@ # instantiate a form page from it. set form_form_id 0 if {$form_form ne ""} { - set form_form_id [::xo::db::CrClass lookup -name $form_form -parent_id [[my package_id] folder_id]] + set form_form_id [::xo::db::CrClass lookup -name $form_form -parent_id [${:package_id} folder_id]] } # The normal form requires for rich-text the 2 element list as content if {$form_form_id == 0} { set form [list $form text/html] } - set item_id [::xo::db::CrClass lookup -name $form_name -parent_id [[my package_id] folder_id]] + set item_id [::xo::db::CrClass lookup -name $form_name -parent_id [${:package_id} folder_id]] if {$item_id == 0} { if {$form_form_id == 0} { set f [::xowiki::Form new \ - -package_id [my package_id] \ - -parent_id [[my package_id] folder_id] \ + -package_id ${:package_id} \ + -parent_id [${:package_id} folder_id] \ -name $form_name \ -anon_instances $voting_form_anon_instances \ -form $form \ @@ -4166,8 +4166,8 @@ } else { set f [::xowiki::FormPage new \ -page_template $form_form_id \ - -package_id [my package_id] \ - -parent_id [[my package_id] folder_id] \ + -package_id ${:package_id} \ + -parent_id [${:package_id} folder_id] \ -name $form_name] $f set_property anon_instances $voting_form_anon_instances $f set_property form $form @@ -4210,7 +4210,7 @@ } iframe instproc render {} { - my get_parameters + :get_parameters if {$title eq ""} {set title $url} set content "" @@ -4315,7 +4315,7 @@ } yui-carousel instproc render {} { - my get_parameters + :get_parameters set ajaxhelper 1 ::xowiki::Includelet require_YUI_CSS -ajaxhelper $ajaxhelper carousel/assets/skins/sam/carousel.css @@ -4388,10 +4388,10 @@ set content "
      \n" if {$form ne ""} { - set images [my form_images -package_id $package_id -parent_id $parent_id \ + set images [:form_images -package_id $package_id -parent_id $parent_id \ -form $form -glob $glob -width $width -height $height] } else { - set images [my images -package_id $package_id -parent_id $parent_id \ + set images [:images -package_id $package_id -parent_id $parent_id \ -glob $glob -width $width -height $height] } foreach entry [$images children] { @@ -4434,7 +4434,7 @@ } gravatar instproc render {} { - my get_parameters + :get_parameters return "[ns_quotehtml $email]" } } @@ -4478,7 +4478,7 @@ } random-form-page instproc render {} { - my get_parameters + :get_parameters set cmd [list ::xowiki::includelet::random-form-page page_names $package_id $form $publish_status] if {[ns_info name] eq "NaviServer"} { @@ -4520,7 +4520,7 @@ } flowplayer instproc render {} { - my get_parameters + :get_parameters return "