EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HFP-1871 Use param from MathDisplay library.json for configuration

HFP-2095-Fix-table-styling
Oliver Tacke 2018-07-25 15:08:29 +02:00
parent 04707a9f8a
commit 62b6345c49
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
h5p.classes.php
View File

@ -1938,12 +1938,37 @@ class H5PCore {
} }
$validator->validateLibrary($params, (object) array('options' => array($params->library))); $validator->validateLibrary($params, (object) array('options' => array($params->library)));
// Add MathDisplay. // Add latest MathDisplay version if content contains math
// TODO: Get library name for MathDisplay dynamically
// TODO: Get regexp from MathDisplay config
// TODO: Find out how to pass settings to MathDisplay // TODO: Find out how to pass settings to MathDisplay
if ($this->containsMath($params->params)) { $libs = $this->h5pF->loadLibraries();
$validator->addMathDisplay('H5P.MathDisplay 0.1');
// Get latest version of MathDisplay library
$mathLibs = $libs['H5P.MathDisplay'];
foreach($mathLibs as $libVersion) {
if ($libVersion->major_version === $majorMax && $libVersion->minor_version > $minorMax) {
$mathLib = $libVersion;
}
else if ($libVersion->major_version > $majorMax) {
$mathLib = $libVersion;
}
}
if (isset($mathLib)) {
// Retrieve regular expression from library.json
// Careful: \ will have to be escaped itself inside json
$libParams = $this->loadLibrary($mathLib->name, $mathLib->major_version, $mathLib->minor_version);
// Is there a general function to pass a "path" to that finds a parameter?
$libParamsTypes = $libParams['addTo']['content']['types'];
foreach($libParamsTypes as $type => $property) {
$regex = $property['text']['regex'];
if (isset($regex)) {
break;
}
}
if ($this->containsMath($params->params, $regex)) {
$validator->addMathDisplay($mathLib->name . ' ' . $mathLib->major_version . '.' . $mathLib->minor_version);
}
} }
$params = json_encode($params->params); $params = json_encode($params->params);
@ -1986,7 +2011,10 @@ class H5PCore {
* @param {boolean} [found] - Used for recursion. * @param {boolean} [found] - Used for recursion.
* @return {boolean} True, if params contain math. * @return {boolean} True, if params contain math.
*/ */
private function containsMath ($params, $mathPattern = '/\$\$.+\$\$|\\\[.+\\\]|\\\(.+\\\)/', $found = false) { private function containsMath ($params, $mathPattern, $found = false) {
if (!isset($mathPattern) == NULL) {
$mathPattern = '/\$\$.+\$\$|\\\[.+\\\]|\\\(.+\\\)/';
}
foreach($params as $property => $value) { foreach($params as $property => $value) {
if (gettype($value) === 'string') { if (gettype($value) === 'string') {
if (preg_match($mathPattern, $value) === 1) { if (preg_match($mathPattern, $value) === 1) {