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

Validate requirements on the option form

namespaces
Svein-Tore Griff With 2012-11-28 14:45:54 +01:00
parent 2413be911c
commit 44dfbbc4f6
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
h5p.classes.php
View File

@ -40,7 +40,7 @@ class h5pValidator {
'w' => '/^[0-9]{1,4}$/', 'w' => '/^[0-9]{1,4}$/',
'h' => '/^[0-9]{1,4}$/', 'h' => '/^[0-9]{1,4}$/',
'metaKeywords' => '/^.{1,}$/', 'metaKeywords' => '/^.{1,}$/',
'metaDescription' => '/^.{1,}$/', 'metaDescription' => '/^.{1,}$/k',
); );
public function __construct($h5pFramework) { public function __construct($h5pFramework) {
@ -122,7 +122,7 @@ class h5pValidator {
} }
if (isset($h5pData->preloadedCss)) { if (isset($h5pData->preloadedCss)) {
if (!$this->isExcistingFiles($h5pData->preloadedCss, $tmp_dir, $file)) { if (!$this->isExcistingFiles($h5pData->preloadedCss, $tmp_dir, $file)) {
// TODO: Handle the fact that we are missing js files // TODO: Handle the fact that we are missing css files
} }
} }
} }
@ -199,6 +199,10 @@ class h5pValidator {
private function validateRequiredH5pData($h5pData, $requirements, $library_name) { private function validateRequiredH5pData($h5pData, $requirements, $library_name) {
$errors = array(); $errors = array();
foreach ($requirements as $required => $requirement) { foreach ($requirements as $required => $requirement) {
if (is_int($required)) {
// We have an array of allowed options
return validateH5pDataOptions($h5pData, $requirements, $library_name);
}
if (isset($h5pData[$required])) { if (isset($h5pData[$required])) {
array_merge($errors, validateRequirement($h5pData[$required], $requirement, $library_name, $required)); array_merge($errors, validateRequirement($h5pData[$required], $requirement, $library_name, $required));
} }
@ -209,6 +213,16 @@ class h5pValidator {
return $errors; return $errors;
} }
private function validateH5pDataOptions($selected, $allowed, $library_name) {
$errors = array();
foreach ($selected as $value) {
if (!in_array($value, $allowed)) {
$errors[] = $this->t('Illegal option %option in %library', array('%option' => $value, '%library' => $library_name));
}
}
return $errors;
}
/** /**
* Recursive function for removing directories. * Recursive function for removing directories.
* *