Index: openacs-4/packages/xotcl-core/xotcl-core.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/xotcl-core.info,v
diff -u -r1.106.2.24 -r1.106.2.25
--- openacs-4/packages/xotcl-core/xotcl-core.info	21 Oct 2020 17:47:06 -0000	1.106.2.24
+++ openacs-4/packages/xotcl-core/xotcl-core.info	19 Nov 2020 21:21:13 -0000	1.106.2.25
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xotcl</auto-mount>
 
-    <version name="5.10.0d36" url="http://media.wu-wien.ac.at/download/xotcl-core-5.10.0d36.apm">
+    <version name="5.10.0d37" url="http://media.wu-wien.ac.at/download/xotcl-core-5.10.0d37.apm">
 	<owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
 	<summary>XOTcl library functionality (e.g. thread handling, online documentation, Generic Form and List Classes)</summary>
 	<release-date>2017-08-06</release-date>
@@ -42,7 +42,7 @@
 	<license>BSD-Style</license>
 	<maturity>2</maturity>
 
-	<provides url="xotcl-core" version="5.10.0d36"/>
+	<provides url="xotcl-core" version="5.10.0d37"/>
 	<requires url="acs-kernel" version="5.10.0d11"/>
 	<requires url="acs-templating" version="5.9.1"/>
 	<requires url="acs-api-browser" version="5.9.1"/>
Index: openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl,v
diff -u -r1.93.2.30 -r1.93.2.31
--- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	28 Oct 2020 17:33:36 -0000	1.93.2.30
+++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	19 Nov 2020 21:21:13 -0000	1.93.2.31
@@ -94,6 +94,16 @@
         return -code error "Value '$value' of parameter $name is not a valid local url."
       }
     }
+    :method type=nohtml {name value} {
+      if {[ad_page_contract_filter_proc_nohtml name value] == 0} {
+        return -code error "Value '$value' of parameter $name contains HTML."
+      }
+    }
+    :method type=html {name value} {
+      if {[ad_page_contract_filter_proc_html name value] == 0} {
+        return -code error "Value '$value' of parameter $name contains unsafe HTML."
+      }
+    }
   }
 
   ::xotcl::Object proc setExitHandler {code} {::nsf::exithandler set $code}
@@ -109,6 +119,8 @@
     ::nx::Slot method type=naturalnum
     ::nx::Slot method type=token
     ::nx::Slot method type=localurl
+    ::nx::Slot method type=html
+    ::nx::Slot method type=nohtml
     ::nx::Object nsfproc ::nsf::debug::call
     ::nx::Object nsfproc ::nsf::debug::exit
   }
@@ -389,7 +401,7 @@
     }
     append _ "Server:    [ns_info patchlevel] ([ns_info name] [ns_info tag])\n"
     append _ "NSF:       $::nsf::patchLevel\n"
-    append _ "Tcl:       $::tcl_patchLevel\n"    
+    append _ "Tcl:       $::tcl_patchLevel\n"
     append _ "XOTcl:     $::xotcl::version$::xotcl::patchlevel\n"
     append _ "Tdom:      [package req tdom]\n"
     append _ "libthread: [ns_config ns/server/[ns_info server]/modules libthread]\n"
Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.180.2.49 -r1.180.2.50
--- openacs-4/packages/xowiki/xowiki.info	17 Oct 2020 16:31:27 -0000	1.180.2.49
+++ openacs-4/packages/xowiki/xowiki.info	19 Nov 2020 21:21:13 -0000	1.180.2.50
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d65" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d65.apm">
+    <version name="5.10.0d66" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d66.apm">
 	<owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
 	<summary>A xotcl-based enterprise wiki system with multiple object types</summary>
 	<release-date>2017-08-06</release-date>
@@ -55,8 +55,8 @@
 	<license>BSD-Style</license>
 	<maturity>2</maturity>
 
-	<provides url="xowiki" version="5.10.0d65"/>
-	<requires url="xotcl-core" version="5.10.0d35"/>
+	<provides url="xowiki" version="5.10.0d66"/>
+	<requires url="xotcl-core" version="5.10.0d37"/>
 	<requires url="acs-datetime" version="5.9.1"/>
 	<requires url="acs-kernel" version="5.9.1"/>
 	<requires url="acs-tcl" version="5.10.0d38"/>
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.58 -r1.239.2.59
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	19 Nov 2020 19:25:55 -0000	1.239.2.58
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	19 Nov 2020 21:21:13 -0000	1.239.2.59
@@ -4975,14 +4975,14 @@
   # Get pseudostreaming plugin from
   #     http://flowplayer.org/plugins/streaming/pseudostreaming.html#download
   #
-  # install bowth under packages/xowiki/www/resources/flowplayer
+  # install both under packages/xowiki/www/resources/flowplayer
   #
   ::xowiki::IncludeletClass create flowplayer \
       -superclass ::xowiki::Includelet \
       -parameter {
         {__decoration none}
         {parameter_declaration {
-          -mp4:required,localurl
+          -mp4:required,nohtml
         }}
       } -ad_doc {
         Include an mp4 image using flowplayer