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

HFP-1871 Improve addon feature

HFP-2095-Fix-table-styling
Paal Joergensen 2018-08-28 08:08:56 +02:00
parent 6959f65022
commit 8c374be79d
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
h5p.classes.php
View File

@ -1993,10 +1993,12 @@ class H5PCore {
if (isset($add_to->content->types)) {
foreach($add_to->content->types as $type) {
if ($this->textAddonMatches($params->params, $type->text->regex)) {
if (isset($type->text->regex) &&
$this->textAddonMatches($params->params, $type->text->regex)) {
$validator->addon($addon);
// Addon can only be added once
// An addon shall only be added once
break;
}
}
@ -2079,39 +2081,29 @@ class H5PCore {
}
/**
* Determine if params contain math.
* Determine if params contain any match.
*
* @param {object} params - Parameters.
* @param {string} [mathPattern] - Regular expression to identify math.
* @param {string} [pattern] - Regular expression to identify pattern.
* @param {boolean} [found] - Used for recursion.
* @return {boolean} True, if params contain math.
* @return {boolean} True, if params matches pattern.
*/
private function textAddonMatches($params, $mathPattern, $found = false) {
if (!isset($mathPattern)) {
$mathPattern = '/\$\$.+\$\$|\\\[.+\\\]|\\\(.+\\\)/';
}
foreach($params as $property => $value) {
if (gettype($value) === 'string') {
if (preg_match($mathPattern, $value) === 1) {
$found = true;
break;
private function textAddonMatches($params, $pattern, $found = false) {
$type = gettype($params);
if ($type === 'string') {
if (preg_match($pattern, $params) === 1) {
return true;
}
}
if ($found === false) {
if (gettype($value) === 'array') {
for ($i = 0; $i < sizeof($value); $i++) {
$found = $this->textAddonMatches($value[$i], $mathPattern, $found);
elseif ($type === 'array' || $type === 'object') {
foreach ($params as $value) {
$found = $this->textAddonMatches($value, $pattern, $found);
if ($found === true) {
break;
return true;
}
}
}
if (gettype($value) === 'object') {
$found = $this->textAddonMatches($value, $mathPattern, $found);
}
}
}
return $found;
return false;
}
/**