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

Fix validation of old libraries before running content upgrade

pull/61/head
Frode Petterson 2019-03-25 14:03:43 +01:00
parent 60fb6c96ca
commit ac5dba1e19
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
h5p.classes.php
View File

@ -1006,28 +1006,29 @@ class H5PValidator {
if (!empty($missingLibraries)) { if (!empty($missingLibraries)) {
// We still have missing libraries, check if our main library has an upgrade (BUT only if we has content) // We still have missing libraries, check if our main library has an upgrade (BUT only if we has content)
$mainDependency = NULL; $mainDependency = NULL;
if (!$skipContent && !empty($mainH5PData)) { if (!$skipContent && !empty($mainH5pData)) {
foreach ($mainH5PData['preloadedDependencies'] as $dep) { foreach ($mainH5pData['preloadedDependencies'] as $dep) {
if ($dep['machineName'] === $mainH5PData['mainLibrary']) { if ($dep['machineName'] === $mainH5pData['mainLibrary']) {
$mainDependency = $dep; $mainDependency = $dep;
} }
} }
} }
if ($skipContent || !$mainDependency || !$this->h5pF->libraryHasUpgrade(array( if ($skipContent || !$mainDependency || !$this->h5pF->libraryHasUpgrade(array(
'machineName' => $mainDependency['mainLibrary'], 'machineName' => $mainDependency['machineName'],
'majorVersion' => $mainDependency['majorVersion'], 'majorVersion' => $mainDependency['majorVersion'],
'minorVersion' => $mainDependency['minorVersion'] 'minorVersion' => $mainDependency['minorVersion']
))) { ))) {
foreach ($missingLibraries as $libString => $library) { foreach ($missingLibraries as $libString => $library) {
$this->h5pF->setErrorMessage($this->h5pF->t('Missing required library @library', array('@library' => $libString)), 'missing-required-library'); $this->h5pF->setErrorMessage($this->h5pF->t('Missing required library @library', array('@library' => $libString)), 'missing-required-library');
$valid = FALSE;
} }
if (!$this->h5pC->mayUpdateLibraries()) { if (!$this->h5pC->mayUpdateLibraries()) {
$this->h5pF->setInfoMessage($this->h5pF->t("Note that the libraries may exist in the file you uploaded, but you're not allowed to upload new libraries. Contact the site administrator about this.")); $this->h5pF->setInfoMessage($this->h5pF->t("Note that the libraries may exist in the file you uploaded, but you're not allowed to upload new libraries. Contact the site administrator about this."));
$valid = FALSE;
} }
} }
} }
$valid = empty($missingLibraries) && $valid;
} }
if (!$valid) { if (!$valid) {
H5PCore::deleteFileTree($tmpDir); H5PCore::deleteFileTree($tmpDir);