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

HFP-1871 Add function to load MathDisplay if params contain math

HFP-2095-Fix-table-styling
Oliver Tacke 2018-06-13 18:36:23 +02:00
parent 3ce0adf418
commit 04707a9f8a
1 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
h5p.classes.php
View File

@ -1770,7 +1770,7 @@ abstract class H5PHubEndpoints {
* Functions and storage shared by the other H5P classes * Functions and storage shared by the other H5P classes
*/ */
class H5PCore { class H5PCore {
public static $coreApi = array( public static $coreApi = array(
'majorVersion' => 1, 'majorVersion' => 1,
'minorVersion' => 16 'minorVersion' => 16
@ -1938,6 +1938,14 @@ class H5PCore {
} }
$validator->validateLibrary($params, (object) array('options' => array($params->library))); $validator->validateLibrary($params, (object) array('options' => array($params->library)));
// Add MathDisplay.
// TODO: Get library name for MathDisplay dynamically
// TODO: Get regexp from MathDisplay config
// TODO: Find out how to pass settings to MathDisplay
if ($this->containsMath($params->params)) {
$validator->addMathDisplay('H5P.MathDisplay 0.1');
}
$params = json_encode($params->params); $params = json_encode($params->params);
// Update content dependencies. // Update content dependencies.
@ -1970,6 +1978,39 @@ class H5PCore {
return $params; return $params;
} }
/**
* Determine if params contain math.
*
* @param {object} params - Parameters.
* @param {string} [mathPattern] - Regular expression to identify math.
* @param {boolean} [found] - Used for recursion.
* @return {boolean} True, if params contain math.
*/
private function containsMath ($params, $mathPattern = '/\$\$.+\$\$|\\\[.+\\\]|\\\(.+\\\)/', $found = false) {
foreach($params as $property => $value) {
if (gettype($value) === 'string') {
if (preg_match($mathPattern, $value) === 1) {
$found = true;
break;
}
}
if ($found === false) {
if (gettype($value) === 'array') {
for ($i = 0; $i < sizeof($value); $i++) {
$found = $this->containsMath($value[$i], $mathPattern, $found);
if ($found === true) {
break;
}
}
}
if (gettype($value) === 'object') {
$found = $this->containsMath($value, $mathPattern, $found);
}
}
}
return $found;
}
/** /**
* Generate content slug * Generate content slug
* *
@ -3204,6 +3245,23 @@ class H5PContentValidator {
$this->dependencies = array(); $this->dependencies = array();
} }
/**
* Add MathDisplay.
*/
public function addMathDisplay($libraryName) {
$libSpec = H5PCore::libraryFromString($libraryName);
$library = $this->h5pC->loadLibrary($libSpec['machineName'], $libSpec['majorVersion'], $libSpec['minorVersion']);
$library['semantics'] = $this->h5pC->loadLibrarySemantics($libSpec['machineName'], $libSpec['majorVersion'], $libSpec['minorVersion']);
$depKey = 'preloaded-' . $library['machineName'];
$this->dependencies[$depKey] = array(
'library' => $library,
'type' => 'preloaded'
);
$this->nextWeight = $this->h5pC->findLibraryDependencies($this->dependencies, $library, $this->nextWeight);
$this->dependencies[$depKey]['weight'] = $this->nextWeight++;
}
/** /**
* Get the flat dependency tree. * Get the flat dependency tree.
* *