Bug fix = ignored in requiretimes

Replace http youtube links with https links in filter
Add Mathjax to license

Author: drlippman

assessment/displayq2.php

@@ -5033,7 +5033,7 @@ function checkreqtimes($tocheck,$rtimes) {
 	if ($tocheck=='DNE' || $tocheck=='oo' || $tocheck=='+oo' || $tocheck=='-oo') {
 		return 1;
 	}
-	$cleanans = preg_replace('/[^\w\*\/\+\-\(\)\[\],\.\^]+/','',$tocheck);
+	$cleanans = preg_replace('/[^\w\*\/\+\-\(\)\[\],\.\^=]+/','',$tocheck);
 	//if entry used pow or exp, we want to replace them with their asciimath symbols for requiretimes purposes
 	$cleanans = str_replace("pow","^",$cleanans);
 	$cleanans = str_replace("exp","e",$cleanans);

filter/filter.php

@@ -73,6 +73,9 @@ function svgfilterscriptcallback($arr) {
 
 	function filter($str) {
 		global $sessiondata,$userfullname,$urlmode,$imasroot;
+		if ($urlmode == 'https://') {
+			$str = str_replace(array('http://www.youtube.com','http://youtu.be'),array('https://www.youtube.com','https://youtu.be'), $str);
+		}
 		if (strip_tags($str)==$str) {
 			$str = str_replace("\n","<br/>\n",$str);
 		}

license.txt

@@ -45,6 +45,10 @@ AsciiMath and AsciiSvg Plugins for TinyMCE
 Based on code by David Lippman and Peter Jipsen
 LGPL License
 
+MathJax
+(c) The MathJax Consortium
+Apache License
+
 TinyMCE File manager
 Adapted from work by TadejK
 http://sourceforge.net/tracker/index.php?func=detail&aid=1698519&group_id=103281&atid=738747