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

Make sure required files and folders exists

namespaces
Svein-Tore Griff With 2012-11-29 08:57:01 +01:00
parent 8737c75ea3
commit 032da68702
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
h5p.classes.php
View File

@ -80,14 +80,13 @@ class h5pValidator {
$libraries = array(); $libraries = array();
$files = scandir($tmp_dir); $files = scandir($tmp_dir);
$json_exists = $image_exists = $content_exists = FALSE; $mainH5pExists = $imageExists = $contentExists = FALSE;
foreach ($files as $file) { foreach ($files as $file) {
if (in_array($file, array('.', '..'))) { if (in_array($file, array('.', '..'))) {
continue; continue;
} }
$file_path = $tmp_dir . DIRECTORY_SEPARATOR . $file; $file_path = $tmp_dir . DIRECTORY_SEPARATOR . $file;
if (strtolower($file) == 'h5p.json') { if (strtolower($file) == 'h5p.json') {
$json_exists = TRUE;
$h5pData = $this->getJsonData($file_path); $h5pData = $this->getJsonData($file_path);
if ($h5pData === FALSE) { if ($h5pData === FALSE) {
$valid = FALSE; $valid = FALSE;
@ -106,7 +105,7 @@ class h5pValidator {
} }
elseif (strtolower($file) == 'h5p.jpg') { elseif (strtolower($file) == 'h5p.jpg') {
$image_exists = TRUE; $imageExists = TRUE;
} }
elseif ($file == 'content') { elseif ($file == 'content') {
$jsonData = $this->getJsonData($file_path . DIRECTORY_SEPARATOR . 'content.json'); $jsonData = $this->getJsonData($file_path . DIRECTORY_SEPARATOR . 'content.json');
@ -116,7 +115,7 @@ class h5pValidator {
continue; continue;
} }
else { else {
$content_exists = TRUE; $contentExists = TRUE;
// In the future we might let the librarys provide validation functions for content.json // In the future we might let the librarys provide validation functions for content.json
} }
} }
@ -162,6 +161,14 @@ class h5pValidator {
} }
$valid = empty($missingLibraries) && $valid; $valid = empty($missingLibraries) && $valid;
} }
if (!$contentExists) {
$this->h5pF->setErrorMessage($this->h5pF->t('A valid content folder is missing'));
$valid = FALSE;
}
if (!$mainH5pExists) {
$this->h5pF->setErrorMessage($this->h5pF->t('A valid main h5p.json file is missing'));
$valid = FALSE;
}
if (!$valid) { if (!$valid) {
$this->delTree($tmp_dir); $this->delTree($tmp_dir);
} }