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

Validator fixes... 

Added better handling of select widget for multiple selects:
 - Test for array, checks each element if found.
 - Tests if valid options are set in semantics, enters "strict" mode if set (allows only said options)
 - Non strict mode allows any option.
 - All set values are htmlspecialcharred, even if strict.
namespaces
Frank Ronny Larsen 2013-07-15 15:07:53 +02:00
parent 706c61bfe8
commit ca8aca2678
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
h5p.classes.php
View File

@ -1279,22 +1279,36 @@ class H5PContentValidator {
* Validate select values * Validate select values
*/ */
public function validateSelect(&$select, $semantics) { public function validateSelect(&$select, $semantics) {
// Special case for dynamicCheckboxes (valid options are generated live) $strict = FALSE;
if (isset($semantics->widget) && $semantics->widget == 'dynamicCheckboxes') { if (isset($semantics->options) && !empty($semantics->options)) {
// No practical way to guess valid parameters. Just make sure we don't // We have a strict set of options to choose from.
// have special chars here. Also, dynamicCheckboxes will insert an $strict = TRUE;
// array, so iterate it. $options = array();
foreach ($semantics->options as $option) {
$options[$option->value] = TRUE;
}
}
// Multichoice generates array of values. Test each one against valid
// options, if we are strict.
if (is_array($select)) {
foreach ($select as $key => $value) { foreach ($select as $key => $value) {
if ($strict && !isset($options[$value])) {
$this->h5pF->setErrorMessage($this->h5pF->t('Invalid selected option in multiselect.'));
unset($select[$key]);
}
else {
$select[$key] = htmlspecialchars($value, ENT_QUOTES, 'UTF-8'); $select[$key] = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
} }
} }
else if (!in_array($select, array_map(array($this, 'map_object_value'), $semantics->options))) { }
else {
if ($strict && !isset($options[$select])) {
$this->h5pF->setErrorMessage($this->h5pF->t('Invalid selected option in select.')); $this->h5pF->setErrorMessage($this->h5pF->t('Invalid selected option in select.'));
$select = $semantics->options[0]->value; $select = $semantics->options[0]->value;
} }
$select = htmlspecialchars($select, ENT_QUOTES, 'UTF-8');
} }
private function map_object_value($o) {
return $o->value;
} }
/** /**
@ -1395,8 +1409,16 @@ class H5PContentValidator {
} }
} }
if ($found) { if ($found) {
if ($function) {
$this->$function($value, $field); $this->$function($value, $field);
} }
else {
// We have a field type in semantics for which we don't have a
// known validator.
$this->h5pF->setErrorMessage($this->h5pF->t('H5P internal error: unknown content type "@type" in semantics. Removing content!', array('@type' => $field->type)));
unset($group->$key);
}
}
else { else {
// If validator is not found, something exists in content that does // If validator is not found, something exists in content that does
// not have a corresponding semantics field. Remove it. // not have a corresponding semantics field. Remove it.