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

Generalize addons

HFP-2095-Fix-table-styling
Paal Joergensen 2018-08-23 10:24:20 +02:00
parent 64e5ab4424
commit 6c4f904079
1 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
h5p.classes.php
View File

@ -101,6 +101,13 @@ interface H5PFrameworkInterface {
*/ */
public function getUploadedH5pPath(); public function getUploadedH5pPath();
/**
* Load addon libraries
*
* @return array
*/
public function loadAddons();
/** /**
* Get a list of the current installed libraries * Get a list of the current installed libraries
* *
@ -1609,7 +1616,7 @@ Class H5PExport {
$library['minorVersion'] $library['minorVersion']
); );
if ($isDevLibrary !== NULL) { if ($isDevLibrary !== NULL && isset($library['path'])) {
$exportFolder = "/" . $library['path']; $exportFolder = "/" . $library['path'];
} }
} }
@ -1938,33 +1945,20 @@ class H5PCore {
} }
$validator->validateLibrary($params, (object) array('options' => array($params->library))); $validator->validateLibrary($params, (object) array('options' => array($params->library)));
// Get latest version of MathDisplay library // Handle addons:
$libs = $this->h5pF->loadLibraries(); $addons = $this->h5pF->loadAddons();
$mathLibs = $libs['H5P.MathDisplay']; foreach ($addons as $addon) {
$add_to = json_decode($addon['addTo']);
$majorMax = '0'; if (isset($add_to->content->types)) {
$minorMax = '0'; foreach($add_to->content->types as $type) {
foreach($mathLibs as $libVersion) { if ($this->textAddonMatches($params->params, $type->text->regex)) {
if ($libVersion->major_version === $majorMax && $libVersion->minor_version >= $minorMax) { $validator->addon($addon);
$mathLib = $libVersion;
$minorMax = $libVersion->minor_version; // Addon can only be added once
} break;
else if ($libVersion->major_version > $majorMax) {
$mathLib = $libVersion;
$majorMax = $libVersion->major_version;
$minorMax = $libVersion->minor_version;
} }
} }
// Add latest MathDisplay version if content contains math
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);
$regex = $this->retrieveValue($libParams, 'addTo.content.types.text.regex');
if ($this->containsMath($params->params, $regex)) {
$validator->addMathDisplay($mathLib->name . ' ' . $mathLib->major_version . '.' . $mathLib->minor_version);
} }
} }
@ -2051,7 +2045,7 @@ 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 textAddonMatches($params, $mathPattern, $found = false) {
if (!isset($mathPattern)) { if (!isset($mathPattern)) {
$mathPattern = '/\$\$.+\$\$|\\\[.+\\\]|\\\(.+\\\)/'; $mathPattern = '/\$\$.+\$\$|\\\[.+\\\]|\\\(.+\\\)/';
} }
@ -2065,14 +2059,14 @@ class H5PCore {
if ($found === false) { if ($found === false) {
if (gettype($value) === 'array') { if (gettype($value) === 'array') {
for ($i = 0; $i < sizeof($value); $i++) { for ($i = 0; $i < sizeof($value); $i++) {
$found = $this->containsMath($value[$i], $mathPattern, $found); $found = $this->textAddonMatches($value[$i], $mathPattern, $found);
if ($found === true) { if ($found === true) {
break; break;
} }
} }
} }
if (gettype($value) === 'object') { if (gettype($value) === 'object') {
$found = $this->containsMath($value, $mathPattern, $found); $found = $this->textAddonMatches($value, $mathPattern, $found);
} }
} }
} }
@ -3314,12 +3308,13 @@ class H5PContentValidator {
} }
/** /**
* Add MathDisplay. * Add Addon library.
*/ */
public function addMathDisplay($libraryName) { public function addon($library) {
$libSpec = H5PCore::libraryFromString($libraryName); // We need to run loadLibrarySemantics even if we have loadeed semantics from db, in case of
$library = $this->h5pC->loadLibrary($libSpec['machineName'], $libSpec['majorVersion'], $libSpec['minorVersion']); // 1) development foler
$library['semantics'] = $this->h5pC->loadLibrarySemantics($libSpec['machineName'], $libSpec['majorVersion'], $libSpec['minorVersion']); // 2) Invocation of semantics alter hook
$library['semantics'] = $this->h5pC->loadLibrarySemantics($library['machineName'], $library['majorVersion'], $library['minorVersion']);
$depKey = 'preloaded-' . $library['machineName']; $depKey = 'preloaded-' . $library['machineName'];
$this->dependencies[$depKey] = array( $this->dependencies[$depKey] = array(