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 -N -r1.18 -r1.19 --- openacs-4/packages/xowiki/tcl/chat-procs.tcl 27 Oct 2014 16:42:04 -0000 1.18 +++ openacs-4/packages/xowiki/tcl/chat-procs.tcl 16 Jun 2015 19:49:20 -0000 1.19 @@ -147,7 +147,7 @@ setInterval('$get_update',5000)
- @@ -181,7 +181,7 @@ var send_url = \"$send_url\";
- 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 -N -r1.247 -r1.248 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 15 Jun 2015 19:21:06 -0000 1.247 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 16 Jun 2015 19:49:20 -0000 1.248 @@ -1357,7 +1357,7 @@ } else { set src "/shared/portrait-bits.tcl?user_id=$v" } - set photo "" + set photo "" set photo_class "photo" } else { set photo "" 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 -N -r1.196 -r1.197 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 15 Jun 2015 19:21:06 -0000 1.196 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 16 Jun 2015 19:49:21 -0000 1.197 @@ -1459,7 +1459,7 @@ set notifications_return_url [expr {[info exists return_url] ? $return_url : [ad_return_url]}] set notification_image \ "$notification_text" + alt='[ns_quotehtml $notification_text]' title='[ns_quotehtml $notification_text]'>" set cat_notif_link [export_vars -base /notifications/request-new \ {{return_url $notifications_return_url} \ @@ -1468,7 +1468,7 @@ {object_id $category_id}}] append entry " " \ "" + "alt='[ns_quotehtml $notification_text]' title='[ns_quotehtml $notification_text]'>" } lappend entries $entry @@ -2506,7 +2506,7 @@ # 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] - append output "
  • " + append output "
  • " } set p [::xo::db::CrClass get_instance_from_db -item_id 0 -revision_id $page_id] @@ -2689,7 +2689,7 @@ set id [my js_name] append output \ - "
      \n" \ + "
        \n" \
      • [join [my render_images $pages] "
        • \n
      • "]
        • \ "
      \n" @@ -2743,7 +2743,7 @@ set id [my js_name] append output \ - "
        \n" \ + "
          \n" \
        • [join [my render_images $pages] "
          • \n
        • "]
          • \ "
        \n" @@ -2803,7 +2803,7 @@ set id [my js_name] append output \ - "
        " \ + "
        " \ [join [my render_images -addClass cloudcarousel $pages] "\n"] \ "
        \n" @@ -2881,7 +2881,7 @@ set id [my js_name] append output \ - "
        \n" \ + "
        \n" \ [join [my render_images $pages] "\n"] \ "
        \n" @@ -4231,8 +4231,8 @@ yui-carousel instproc images {-package_id -parent_id {-glob ""} {-width ""} {-height ""}} { set size_info "" - if {$width ne ""} {append size_info " width='$width'"} - if {$height ne ""} {append size_info " height='$height'"} + if {$width ne ""} {append size_info " width='[ns_quotehtml $width]'"} + if {$height ne ""} {append size_info " height='[ns_quotehtml $height]'"} if {$width ne "" && $height ne ""} { set geometry "?geometry=${width}x${height}" } else { @@ -4374,7 +4374,7 @@ } } - set content "
          \n" + set content "
            \n" if {$form ne ""} { set images [my form_images -package_id $package_id -parent_id $parent_id \ -form $form -glob $glob -width $width -height $height] @@ -4418,7 +4418,7 @@ gravatar instproc render {} { my get_parameters - return "$email" + return "[ns_quotehtml $email]" } } Index: openacs-4/packages/xowiki/tcl/link-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v diff -u -N -r1.94 -r1.95 --- openacs-4/packages/xowiki/tcl/link-procs.tcl 15 Jun 2015 19:21:06 -0000 1.94 +++ openacs-4/packages/xowiki/tcl/link-procs.tcl 16 Jun 2015 19:49:21 -0000 1.95 @@ -439,7 +439,7 @@ return "$pre[ns_quotehtml $label]$post" } else { if {[my exists revision_id]} {append link ?revision_id=[my revision_id]} - return "$pre$label$post" + return "$pre[ns_quotehtml $label]$post" } } @@ -485,7 +485,7 @@ return "[ns_quotehtml $label] " } else { set internal_href [string map [list %2e .] $internal_href] - return "" + return "" } } @@ -535,108 +535,15 @@ if {[my exists $a]} {append addParams "so.addParam('$a', '[my set $a]');\n"} } - return "
            $label
            + return "
            $label
            " } # - # plugin link - # - # Class create ::xowiki::Link::plugin -superclass ::xowiki::Link::file -parameter { - # classid width height autostart params - # } - - # ::xowiki::Link::plugin instproc render_found {href label} { - # my instvar package_id name - - # foreach {width height autostart} {320 240 true} break - # foreach a {classid width height autostart} {if {[my exists $a]} {set $a [my set $a]}} - # set arguments [list width height autostart] - - # set object_params "" - # if {[my exists params]} { - # set paramlist [split [my set params] ,] - # foreach p $paramlist { - # set pair [split $p =] - # set param([lindex $pair 0]) [lindex $pair 1] - # } - # } - - # #my msg [my name]-guess-type=[::xowiki::guesstype [my name]] - # set mime [::xowiki::guesstype [my name]] - - # switch $mime { - # video/x-ms-wmv { - # # TODO: using classid will stop firefox loading plugin, - # # without classid IE asks user to allow addon - # # also possible: application/x-mplayer2 - # if {![my exists classid]} {set classid "CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6"} - # foreach f $arguments {if {[info exists $f]} {append object_params ""}} - # set objectElement \ - # "\n\ - # \n$object_params\n\ - # " - # } - # video/quicktime { - # if {![my exists classid]} {set classid "CLSID:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"} - # foreach f $arguments {if {[info exists $f]} {append object_params ""}} - # set objectElement \ - # " \n\ - # \n\ - # \n\ - # $object_params \n\ - # \n\n" - # } - # application/x-shockwave-flash { - # if {![my exists classid]} {set classid "CLSID:D27CDB6E-AE6D-11cf-96B8-444553540000"} - # set embed_options "" - # set app_params "?" - # foreach f $arguments {if {[info exists $f]} { append embed_options "$f = '[set $f]' " }} - # foreach {att value} [array get param] {append app_params "$att=$value&"} ;# replace with export_vars - # set objectElement \ - # " \n\ - # \n\ - # \n\ - # \n" - # } - # application/java { - # if {![my exists classid]} {set classid "clsid:CAFEEFAC-0015-0000-0000-ABCDEFFEDCBA"} - # if {![info exists param(code)]} {set param(code) [my stripped_name]} - # if {![info exists codebase]} {set codebase [$package_id pretty_link -lang [my lang] -download true ""]} - - # foreach {att value} [array get param] {append object_params "\n"} - # set objectElement \ - # "\n\ - # \n\ - # $object_params \n\ - # No Java Support. \n\ - # \n\ - # $object_params \n\ - # \n" - # } - # default { - # my msg "unknown mime type '$mime' for plugin" - # #set mime "application/x-oleobject" - # } - # } - - # return "$objectElement - #
            $label ([my name])
            - # " - # } - - - - # # glossary links # 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.289 -r1.290 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 15 Jun 2015 19:21:06 -0000 1.289 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 16 Jun 2015 19:49:21 -0000 1.290 @@ -812,7 +812,7 @@ } } if {[$page_or_package procsearch $method] eq ""} { - return [my error_msg "Method '$method' is not defined for this object"] + return [my error_msg "Method '[ns_quotehtml $method]' is not defined for this object"] } else { #my msg "--invoke [my set object] id=$page_or_package method=$method ([my id] batch_mode $batch_mode)" @@ -833,7 +833,7 @@ set path [::xowiki::Includelet html_encode [my set object]] set edit_snippet [my create_new_snippet $path] return [my error_msg -status_code 404 -template_file $error_template \ - "Page '$path' is not available. $edit_snippet"] + "Page '[ns_quotehtml $path]' is not available. $edit_snippet"] } } 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 -N -r1.480 -r1.481 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 15 Jun 2015 19:21:07 -0000 1.480 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 16 Jun 2015 19:49:21 -0000 1.481 @@ -1885,7 +1885,7 @@ } elseif {[string match "left-col*" $arg] \ || [string match "right-col*" $arg] \ || $arg eq "sidebar"} { - return "
            " + return "
            " } elseif {$arg eq "box"} { return "
            " } elseif {$arg eq ""} { @@ -4016,14 +4016,14 @@ set link_type [my get_property_from_link_page link_type "unresolved"] set link_icon "http://www.ejoe.at/typo3/sysext/rtehtmlarea/res/accessibilityicons/img/internal_link.gif" if {$link_type eq "unresolved"} { - return [list text "internal-link \ + return [list text "internal-link \ " is_richtext true] } if {$link_type eq "folder_link"} { - return [list text "folder-link \ + return [list text "folder-link \ folder" is_richtext true] } - return [list text "interal-link" is_richtext true] + return [list text "interal-link" is_richtext true] } default { return [list text [$page_template title] is_richtext false]