From db022830a645dca8273d1fe42cd41ea58f5e608a Mon Sep 17 00:00:00 2001 From: Frode Petterson Date: Fri, 2 Nov 2018 09:54:23 +0100 Subject: [PATCH 1/4] Add m4a extension to content files whitelist --- h5p.classes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/h5p.classes.php b/h5p.classes.php index b0099bc..5681b85 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -1864,7 +1864,7 @@ class H5PCore { 'js/h5p-utils.js', ); - public static $defaultContentWhitelist = 'json png jpg jpeg gif bmp tif tiff svg eot ttf woff woff2 otf webm mp4 ogg mp3 wav txt pdf rtf doc docx xls xlsx ppt pptx odt ods odp xml csv diff patch swf md textile vtt webvtt'; + public static $defaultContentWhitelist = 'json png jpg jpeg gif bmp tif tiff svg eot ttf woff woff2 otf webm mp4 ogg mp3 m4a wav txt pdf rtf doc docx xls xlsx ppt pptx odt ods odp xml csv diff patch swf md textile vtt webvtt'; public static $defaultLibraryWhitelistExtras = 'js css'; public $librariesJsonData, $contentJsonData, $mainJsonData, $h5pF, $fs, $h5pD, $disableFileCheck; From 898d975921162b6a9479880cebae578ec292a08a Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Fri, 2 Nov 2018 10:03:58 +0100 Subject: [PATCH 2/4] Avoid getting 'Invalid selected option in select' for existing content --- h5p.classes.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/h5p.classes.php b/h5p.classes.php index b0099bc..e5216bc 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -3402,8 +3402,14 @@ class H5PContentValidator { */ public function validateMetadata($metadata) { $semantics = $this->getMetadataSemantics(); - $group = (object)$metadata; + + // Stop complaining about "invalid selected option in select" for + // old content without license chosen. + if (!isset($group->license)) { + $group->license = 'U'; + } + $this->validateGroup($group, (object) array( 'type' => 'group', 'fields' => $semantics, From 39fc577fd56e77de222b02d8971b5c4ca9051168 Mon Sep 17 00:00:00 2001 From: Frode Petterson Date: Fri, 2 Nov 2018 10:14:35 +0100 Subject: [PATCH 3/4] Add prefilter that improves jQuery AJAX --- js/jquery.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/js/jquery.js b/js/jquery.js index 90a3b83..a05d556 100644 --- a/js/jquery.js +++ b/js/jquery.js @@ -13,3 +13,8 @@ var H5P = window.H5P = window.H5P || {}; * @member */ H5P.jQuery = jQuery.noConflict(true); +H5P.jQuery.ajaxPrefilter(function (s) { + if (s.crossDomain) { + s.contents.script = false; + } +}); From 85b278bd52bba4d6cc9d5a1a7dd8ba061742a5f2 Mon Sep 17 00:00:00 2001 From: Frode Petterson Date: Fri, 2 Nov 2018 10:25:35 +0100 Subject: [PATCH 4/4] Fix variable $ --- h5p-metadata.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/h5p-metadata.class.php b/h5p-metadata.class.php index 8462fa4..73223b1 100644 --- a/h5p-metadata.class.php +++ b/h5p-metadata.class.php @@ -90,7 +90,7 @@ abstract class H5PMetadata { $exists = array_key_exists($key, $metadata); // Don't include missing fields - if (!$include_missing && !exists) { + if (!$include_missing && !$exists) { continue; }