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

JI-942 Fix auto content upgrade to work with Drupal module

pull/48/head^2
Frode Petterson 2019-02-05 13:15:50 +01:00
parent aa723bcb40
commit d1dd47be6f
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
exceptions/h5p-save-content-outdated-library-exception.class.php
View File

@ -1,3 +0,0 @@
<?php
class H5PSaveContentOutdatedLibraryException extends Exception { }

19
h5p.classes.php
View File

@ -1419,23 +1419,15 @@ class H5PStorage {
if (isset($options['disable'])) { if (isset($options['disable'])) {
$content['disable'] = $options['disable']; $content['disable'] = $options['disable'];
} }
try {
// Store content in database
$content['id'] = $this->h5pC->saveContent($content, $contentMainId); $content['id'] = $this->h5pC->saveContent($content, $contentMainId);
$this->contentId = $content['id']; $this->contentId = $content['id'];
try {
// Save content folder contents // Save content folder contents
$this->h5pC->fs->saveContent($current_path, $content); $this->h5pC->fs->saveContent($current_path, $content);
} }
catch (Exception $e) { catch (Exception $e) {
if ($e instanceof H5PSaveContentOutdatedLibraryException) { $this->h5pF->setErrorMessage($e->getMessage(), 'save-content-failed');
$message = $this->h5pF->t("You're trying to upload content of an older version of H5P. Please upgrade the content on the server it originated from and try to upload again or turn on the H5P Hub to have this server upgrade it for your automaticall.");
}
else {
$message = $e->getMessage();
}
$this->h5pF->setErrorMessage($message, 'save-content-failed');
} }
// Remove temp content folder // Remove temp content folder
@ -1963,13 +1955,6 @@ class H5PCore {
* @return int Content ID * @return int Content ID
*/ */
public function saveContent($content, $contentMainId = NULL) { public function saveContent($content, $contentMainId = NULL) {
// Check that this is the latest version of the content type we have
if ($this->h5pF->libraryHasUpgrade($content['library'])) {
// We do not allow storing old content due to security concerns
throw new \H5PSaveContentOutdatedLibraryException($this->h5pF->t('Something unexpected happened. We were unable to save this content.'));
}
if (isset($content['id'])) { if (isset($content['id'])) {
$this->h5pF->updateContent($content, $contentMainId); $this->h5pF->updateContent($content, $contentMainId);
} }

3
styles/h5p-admin.css
View File

@ -339,3 +339,6 @@ button.h5p-admin.disabled:hover {
.h5p-data-view .h5p-facet-tag > span:active { .h5p-data-view .h5p-facet-tag > span:active {
color: #d20000; color: #d20000;
} }
.content-upgrade-log {
color: red;
}