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.195 -r1.196 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 12 Jun 2015 21:00:30 -0000 1.195 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 15 Jun 2015 19:21:06 -0000 1.196 @@ -66,7 +66,7 @@ 2 { set v [lindex $pp 1] if {$v eq ""} {set v {""}} - append result " [lindex $pp 0] $v" + append result " [lindex $pp 0] [ns_quotehtml $v]" } } #append result "\n" @@ -81,11 +81,11 @@ ::xowiki::Includelet proc available_includelets {} { if {[my array exists html]} {my array unset html} my describe_includelets [::xowiki::Includelet info subclass] - set result "
[join $entries {, }]\n" : @@ -1409,17 +1408,17 @@ #foreach tag $tags {lappend entries "$tag"} set href [$package_id package_url]/tag/ - foreach tag $tags {lappend entries "$tag"} + foreach tag $tags {lappend entries "[ns_quotehtml $tag]"} set tags_with_links [join [lsort $entries] {, }] if {![my exists id]} {my set id [::xowiki::Includelet html_id [self]]} set content [subst -nobackslashes { #xowiki.your_tags_label#: $tags_with_links (#xowiki.edit_link#, #xowiki.popular_tags_link#) - +
Last $total activities were done by user " \ - "[::xo::get_user_name $user_id]." + "[ns_quotehtml [::xo::get_user_name $user_id]]." } else { append result "
Collaborations in last $total activities by [array size user] Users in this wiki
" @@ -3463,7 +3460,7 @@ } set msg_key [namespace tail [my info class]] set label [_ xowiki.$msg_key [list form_name [$form name]]]$label_suffix - return "$label" + return "[ns_quotehtml $label]" } Class create form-menu-button-new -superclass form-menu-button -parameter { @@ -4076,17 +4073,17 @@ set label [$form_item name] if {$with_form_link} { - append html [_ xowiki.entries_using_form [list form "$label"]] + append html [_ xowiki.entries_using_form [list form "[ns_quotehtml $label]"]] } append html [t1 asHTML] if {$csv} { set csv_href "[::xo::cc url]?[::xo::cc actual_query]&includelet_key=[ns_urlencode $includelet_key]&generate=csv" - lappend links "csv" + lappend links "csv" } if {[info exists voting_form]} { set href "[::xo::cc url]?[::xo::cc actual_query]&includelet_key=[ns_urlencode $includelet_key]&generate=voting_form" - lappend links " Generate Voting Form $voting_form" + lappend links " Generate Voting Form $voting_form" } append html [join $links ,] #my log "render done" @@ -4180,7 +4177,7 @@ set form_href [$item_id pretty_link] set action updated } - return "#xowiki.form-$action# $form_name" + return "#xowiki.form-$action# [ns_quotehtml $form_name]" } } @@ -4204,8 +4201,8 @@ my get_parameters if {$title eq ""} {set title $url} - set content "" - append content "" + set content "" + append content "" return $content } @@ -4507,7 +4504,7 @@ flowplayer instproc render {} { my get_parameters - return " + return "