From 579ba96b49831450bc422f87e934f2b8e002911f Mon Sep 17 00:00:00 2001
From: thomasmars <thomasmars87@gmail.com>
Date: Fri, 1 Jun 2018 11:09:45 +0200
Subject: [PATCH 01/47] HFP-1942 Add crossorigin api call.

Update minor version of core since interface changes
---
 h5p.classes.php |  2 +-
 js/h5p.js       | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 310de97..2efebbd 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1773,7 +1773,7 @@ class H5PCore {
   
   public static $coreApi = array(
     'majorVersion' => 1,
-    'minorVersion' => 15
+    'minorVersion' => 16
   );
   public static $styles = array(
     'styles/h5p.css',
diff --git a/js/h5p.js b/js/h5p.js
index 1b899d3..ef56834 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -1938,6 +1938,16 @@ H5P.createTitle = function (rawTitle, maxLength) {
     }
   };
 
+  /**
+   * Get crossorigin option that is set for site. Usefull for setting crossorigin policy for elements.
+   *
+   * @returns {string|null} Returns the string that should be set as crossorigin policy for elements or null if
+   * no policy is set.
+   */
+  H5P.getCrossOrigin = function () {
+    return H5PIntegration.crossorigin ? H5PIntegration.crossorigin : null;
+  };
+
   /**
    * Async error handling.
    *

From d391d486c954425d681c2e6ad19752138712b29f Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Tue, 18 Sep 2018 14:26:36 +0200
Subject: [PATCH 02/47] HFP-2187 Only allow new license IDs

---
 h5p.classes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 659f224..205a070 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -648,7 +648,7 @@ class H5PValidator {
       'role' => '/^\w+$/',
     ),
     'source' => '/^(http[s]?:\/\/.+)$/',
-    'license' => '/^(CC BY|CC BY-SA|CC BY-ND|CC BY-NC|CC BY-NC-SA|CC BY-NC-ND|CC0 1\.0|GNU GPL|PD|ODC PDDL|CC PDM|U|C|cc-by|cc-by-sa|cc-by-nd|cc-by-nc|cc-by-nc-sa|cc-by-nc-nd|pd|cr|MIT|GPL1|GPL2|GPL3|MPL|MPL2)$/',
+    'license' => '/^(CC BY|CC BY-SA|CC BY-ND|CC BY-NC|CC BY-NC-SA|CC BY-NC-ND|CC0 1\.0|GNU GPL|PD|ODC PDDL|CC PDM|U|C)$/',
     'licenseVersion' => '/^(1\.0|2\.0|2\.5|3\.0|4\.0)$/',
     'licenseExtras' => '/^.{1,5000}$/',
     'yearsFrom' => '/^([0-9]{1,4})$/',

From 3566ac4141b1dac9deca91328bfce939cf9d5a0c Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Tue, 18 Sep 2018 15:02:12 +0200
Subject: [PATCH 03/47] HFP-2183 Default library.metadata property shall be 1

---
 h5p-development.class.php | 2 +-
 h5p.classes.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/h5p-development.class.php b/h5p-development.class.php
index 4188d88..1211517 100644
--- a/h5p-development.class.php
+++ b/h5p-development.class.php
@@ -87,7 +87,7 @@ class H5PDevelopment {
       // Save/update library.
       $library['libraryId'] = $this->h5pF->getLibraryId($library['machineName'], $library['majorVersion'], $library['minorVersion']);
       if (!isset($library['metadata'])) {
-        $library['metadata'] = 0;
+        $library['metadata'] = 1;
       }
       $this->h5pF->saveLibraryData($library, $library['libraryId'] === FALSE);
 
diff --git a/h5p.classes.php b/h5p.classes.php
index 205a070..668d6fa 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1442,7 +1442,7 @@ class H5PStorage {
 
       // Save library meta data
       if (!isset($library['metadata'])) {
-        $library['metadata'] = 0;
+        $library['metadata'] = 1;
       }
       $this->h5pF->saveLibraryData($library, $new);
 

From e2c8d6459a3461aa9bcc2d268d5e0d52d2e66d05 Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Thu, 20 Sep 2018 11:14:50 +0200
Subject: [PATCH 04/47] Numbers use format '%d' - only relevant for WordPress

---
 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 efff0cf..29312fc 100644
--- a/h5p-metadata.class.php
+++ b/h5p-metadata.class.php
@@ -99,7 +99,7 @@ abstract class H5PMetadata {
 
           case 'int':
             $value = ($value !== null) ? intval($value): null;
-            $types[] = '%i';
+            $types[] = '%d';
             break;
 
           case 'json':

From 841d24cab86950ab525daa53f1f8c6e7910cc187 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Fri, 21 Sep 2018 10:05:00 +0200
Subject: [PATCH 05/47] Capitalize metadata titles

---
 js/h5p.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/h5p.js b/js/h5p.js
index 42f9519..c97fe1e 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -1131,7 +1131,7 @@ H5P.buildMetadataCopyrights = function (metadata, contentTypeName) {
 
     return new H5P.MediaCopyright(
       dataset,
-      {type: 'Content type', licenseExtras: 'License extras', changes: 'Changelog'},
+      {type: 'Content Type', licenseExtras: 'License Extras', changes: 'Changelog'},
       ['type', 'title', 'license', 'author', 'year', 'source', 'licenseExtras', 'changes'],
       {type: contentTypeName}
     );

From d6e9c4ec095a133443994946f54e2ba03408be12 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Fri, 21 Sep 2018 13:08:11 +0200
Subject: [PATCH 06/47] Fix const not allowed in abstract class for PHP 5.3

---
 h5p-metadata.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/h5p-metadata.class.php b/h5p-metadata.class.php
index 29312fc..9fb5686 100644
--- a/h5p-metadata.class.php
+++ b/h5p-metadata.class.php
@@ -4,7 +4,7 @@
  */
 abstract class H5PMetadata {
 
-  const FIELDS = array(
+  private static $fields = array(
     'title' => array(
       'type' => 'text',
       'maxLength' => 255
@@ -79,7 +79,7 @@ abstract class H5PMetadata {
       $metadata = (array) $metadata;
     }
 
-    foreach (self::FIELDS as $key => $config) {
+    foreach (self::$fields as $key => $config) {
 
       if ($key === 'title' && !$include_title) {
         continue;

From 73f41e2dbd4346a15ea7e6ab34d2a201d14a264d Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Fri, 21 Sep 2018 15:09:31 +0200
Subject: [PATCH 07/47] library.json: metadata -> metadataSettings

---
 h5p-development.class.php | 11 +++++++----
 h5p-metadata.class.php    | 20 ++++++++++++++++++++
 h5p.classes.php           | 18 ++++++++++++------
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/h5p-development.class.php b/h5p-development.class.php
index 1211517..5823a51 100644
--- a/h5p-development.class.php
+++ b/h5p-development.class.php
@@ -84,11 +84,14 @@ class H5PDevelopment {
 
       // TODO: Validate props? Not really needed, is it? this is a dev site.
 
-      // Save/update library.
       $library['libraryId'] = $this->h5pF->getLibraryId($library['machineName'], $library['majorVersion'], $library['minorVersion']);
-      if (!isset($library['metadata'])) {
-        $library['metadata'] = 1;
-      }
+
+      // Convert metadataSettings values to boolean & json_encode it before saving
+      $library['metadataSettings'] = isset($library['metadataSettings']) ?
+        H5PMetadata::boolifyAndEncodeSettings($library['metadataSettings']) :
+        NULL;
+
+      // Save/update library.
       $this->h5pF->saveLibraryData($library, $library['libraryId'] === FALSE);
 
       $library['path'] = 'development/' . $contents[$i];
diff --git a/h5p-metadata.class.php b/h5p-metadata.class.php
index 9fb5686..4397d7e 100644
--- a/h5p-metadata.class.php
+++ b/h5p-metadata.class.php
@@ -114,4 +114,24 @@ abstract class H5PMetadata {
 
     return $fields;
   }
+
+  /**
+   * The metadataSettings field in libraryJson uses 1 for true and 0 for false.
+   * Here we are converting these to booleans, and also doing JSON encoding.
+   * This is invoked before the library data is beeing inserted/updated to DB.
+   *
+   * @param array $metadataSettings
+   * @return string
+   */
+  public static function boolifyAndEncodeSettings($metadataSettings) {
+    // Convert metadataSettings values to boolean
+    if (isset($metadataSettings['disable'])) {
+      $metadataSettings['disable'] = $metadataSettings['disable'] === 1;
+    }
+    if (isset($metadataSettings['disable'])) {
+      $metadataSettings['disableExtraTitleField'] = $metadataSettings['disableExtraTitleField'] === 1;
+    }
+
+    return json_encode($metadataSettings);
+  }
 }
diff --git a/h5p.classes.php b/h5p.classes.php
index 668d6fa..c8e64ed 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -210,7 +210,9 @@ interface H5PFrameworkInterface {
    *   - minorVersion: The library's minorVersion
    *   - patchVersion: The library's patchVersion
    *   - runnable: 1 if the library is a content type, 0 otherwise
-   *   - metadata: 1 if the library should support setting metadata (copyright etc)
+   *   - metadataSettings: Associative array containing:
+   *      - disable: 1 if the library should not support setting metadata (copyright etc)
+   *      - disableExtraTitleField: 1 if the library don't need the extra title field
    *   - fullscreen(optional): 1 if the library supports fullscreen, 0 otherwise
    *   - embedTypes(optional): list of supported embed types
    *   - preloadedJs(optional): list of associative arrays containing:
@@ -681,7 +683,10 @@ class H5PValidator {
     'author' => '/^.{1,255}$/',
     'license' => '/^(cc-by|cc-by-sa|cc-by-nd|cc-by-nc|cc-by-nc-sa|cc-by-nc-nd|pd|cr|MIT|GPL1|GPL2|GPL3|MPL|MPL2)$/',
     'description' => '/^.{1,}$/',
-    'metadata' => '/^(0|1)$/',
+    'metadataSettings' => array(
+      'disable' => '/^(0|1)$/',
+      'disableExtraTitleField' => '/^(0|1)$/'
+    ),
     'dynamicDependencies' => array(
       'machineName' => '/^[\w0-9\-\.]{1,255}$/i',
       'majorVersion' => '/^[0-9]{1,5}$/',
@@ -1440,10 +1445,11 @@ class H5PStorage {
       // Indicate that the dependencies of this library should be saved.
       $library['saveDependencies'] = TRUE;
 
-      // Save library meta data
-      if (!isset($library['metadata'])) {
-        $library['metadata'] = 1;
-      }
+      // Convert metadataSettings values to boolean & json_encode it before saving
+      $library['metadataSettings'] = isset($library['metadataSettings']) ?
+        H5PMetadata::boolifyAndEncodeSettings($library['metadataSettings']) :
+        NULL;
+
       $this->h5pF->saveLibraryData($library, $new);
 
       // Save library folder

From 64c8090d13cd72bdeab9f1d8af224e9c01ceed21 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Mon, 24 Sep 2018 10:18:13 +0200
Subject: [PATCH 08/47] Add storing of content type title in metadata

---
 h5p.classes.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 668d6fa..0fff359 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -4507,7 +4507,12 @@ class H5PContentValidator {
         'label' => $this->h5pF->t('Author comments'),
         'description' => $this->h5pF->t('Comments for the editor of the content (This text will not be published as a part of copyright info)'),
         'optional' => TRUE
-      )
+      ),
+      (object) array(
+        'name' => 'contentType',
+        'type' => 'text',
+        'widget' => 'none'
+      ),
     );
 
     return $semantics;

From 7762f903c8d00081d002947cc4d117adeb818c2f Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Mon, 24 Sep 2018 11:03:10 +0200
Subject: [PATCH 09/47] Add storing of content type title in metadata

---
 h5p.classes.php |  5 ++++-
 js/h5p.js       | 17 +++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 6c525b3..79111ba 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -3307,7 +3307,10 @@ class H5PCore {
       'licensePD' => $this->h5pF->t('Public Domain'),
       'licenseCC010' => $this->h5pF->t('CC0 1.0 Universal (CC0 1.0) Public Domain Dedication'),
       'licensePDM' => $this->h5pF->t('Public Domain Mark'),
-      'licenseC' => $this->h5pF->t('Copyright')
+      'licenseC' => $this->h5pF->t('Copyright'),
+      'contentType' => $this->h5pF->t('Content Type'),
+      'licenseExtras' => $this->h5pF->t('License Extras'),
+      'changes' => $this->h5pF->t('Changelog'),
     );
   }
 }
diff --git a/js/h5p.js b/js/h5p.js
index c97fe1e..db262d8 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -1108,6 +1108,7 @@ H5P.findCopyrights = function (info, parameters, contentId, extras) {
 H5P.buildMetadataCopyrights = function (metadata, contentTypeName) {
   if (metadata && metadata.license !== undefined && metadata.license !== 'U') {
     var dataset = {
+      contentType: metadata.contentType,
       title: metadata.title,
       author: (metadata.authors && metadata.authors.length > 0) ? metadata.authors.map(function(author) {
         return (author.role) ? author.name + ' (' + author.role + ')' : author.name;
@@ -1122,19 +1123,7 @@ H5P.buildMetadataCopyrights = function (metadata, contentTypeName) {
       }).join(' / ') : undefined
     };
 
-    if (contentTypeName) {
-      contentTypeName = contentTypeName
-        .split(' ')[0]
-        .replace(/^H5P\./, '')
-        .replace(/([a-z])([A-Z])/g, '$1' + ' ' + '$2');
-    }
-
-    return new H5P.MediaCopyright(
-      dataset,
-      {type: 'Content Type', licenseExtras: 'License Extras', changes: 'Changelog'},
-      ['type', 'title', 'license', 'author', 'year', 'source', 'licenseExtras', 'changes'],
-      {type: contentTypeName}
-    );
+    return new H5P.MediaCopyright(dataset);
   }
 };
 
@@ -1424,7 +1413,7 @@ H5P.MediaCopyright = function (copyright, labels, order, extraFields) {
 
     if (order === undefined) {
       // Set default order
-      order = ['title', 'author', 'year', 'source', 'license'];
+      order = ['contentType', 'title', 'license', 'author', 'year', 'source', 'licenseExtras', 'changes'];
     }
 
     for (var i = 0; i < order.length; i++) {

From e75745f0dbaa69e124ef322a497149801b99e766 Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Wed, 26 Sep 2018 10:30:50 +0200
Subject: [PATCH 10/47] metadataSettings returned as JSON, not string

---
 h5p-development.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/h5p-development.class.php b/h5p-development.class.php
index 5823a51..a60262a 100644
--- a/h5p-development.class.php
+++ b/h5p-development.class.php
@@ -94,6 +94,9 @@ class H5PDevelopment {
       // Save/update library.
       $this->h5pF->saveLibraryData($library, $library['libraryId'] === FALSE);
 
+      // Need to decode it again, since it is served from here.
+      $library['metadataSettings'] = json_decode($library['metadataSettings']);
+
       $library['path'] = 'development/' . $contents[$i];
       $this->libraries[H5PDevelopment::libraryToString($library['machineName'], $library['majorVersion'], $library['minorVersion'])] = $library;
     }

From 9081ca31288d1ee46055a88c4d5c0f35dfe184f1 Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Thu, 4 Oct 2018 16:02:05 +0200
Subject: [PATCH 11/47] JI-857 Validate metadata properly

---
 h5p.classes.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 79111ba..5784264 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1947,7 +1947,7 @@ class H5PCore {
     if ($content !== NULL) {
       // Validate main content's metadata
       $validator = new H5PContentValidator($this->h5pF, $this);
-      $validator->validateMetadata($content['metadata']);
+      $content['metadata'] = $validator->validateMetadata($content['metadata']);
 
       $content['library'] = array(
         'id' => $content['libraryId'],
@@ -3384,8 +3384,9 @@ class H5PContentValidator {
    * Validate metadata
    *
    * @param array $metadata
+   * @return array Validated & filtered
    */
-  public function validateMetadata(&$metadata) {
+  public function validateMetadata($metadata) {
     $semantics = $this->getMetadataSemantics();
 
     $group = (object)$metadata;
@@ -3393,6 +3394,8 @@ class H5PContentValidator {
       'type' => 'group',
       'fields' => $semantics,
     ), FALSE);
+
+    return (array)$group;
   }
 
   /**
@@ -3919,7 +3922,7 @@ class H5PContentValidator {
 
     // Validate subcontent's metadata
     if (isset($value->metadata)) {
-      $this->validateMetadata($value->metadata);
+      $value->metadata = $this->validateMetadata($value->metadata);
     }
 
     $validKeys = array('library', 'params', 'subContentId', 'metadata');

From 06985cca7cb2bbec9c1c6724ae4110d67d5acecd Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Fri, 5 Oct 2018 15:14:47 +0200
Subject: [PATCH 12/47] Fix h5p.json title field htmlencoded

---
 h5p.classes.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 5784264..6a6fac8 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1598,6 +1598,16 @@ Class H5PExport {
     $this->h5pC = $H5PCore;
   }
 
+  /**
+   * Reverts the replace pattern used by the text editor
+   *
+   * @param string $value
+   * @return string
+   */
+  private static function revertH5PEditorTextEscape($value) {
+    return str_replace('&lt;', '<', str_replace('&gt;', '>', str_replace('&#039;', "'", str_replace('&quot;', '"', $value))));
+  }
+
   /**
    * Return path to h5p package.
    *
@@ -1630,7 +1640,7 @@ Class H5PExport {
 
     // Build h5p.json, the en-/de-coding will ensure proper escaping
     $h5pJson = array (
-      'title' => $content['title'],
+      'title' => self::revertH5PEditorTextEscape($content['title']),
       'language' => (isset($content['language']) && strlen(trim($content['language'])) !== 0) ? $content['language'] : 'und',
       'mainLibrary' => $content['library']['name'],
       'embedTypes' => $embedTypes

From 8dafa5db91a251534bc07fe5403063e8b6a55990 Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Tue, 16 Oct 2018 09:53:11 +0200
Subject: [PATCH 13/47] Rename 'Change Log' to 'Changelog'

---
 h5p.classes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 6a6fac8..3ab11db 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -4497,7 +4497,7 @@ class H5PContentValidator {
         'field' => (object) array(
           'name' => 'change',
           'type' => 'group',
-          'label' => $this->h5pF->t('Change Log'),
+          'label' => $this->h5pF->t('Changelog'),
           'fields' => array(
             (object) array(
               'name' => 'date',

From c4e52f4f29f3824dd69fbddeeb524ff1dade32aa Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Wed, 17 Oct 2018 13:53:38 +0200
Subject: [PATCH 14/47] Fixed bug for saving metadata settings

---
 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 4397d7e..a7c42ac 100644
--- a/h5p-metadata.class.php
+++ b/h5p-metadata.class.php
@@ -128,7 +128,7 @@ abstract class H5PMetadata {
     if (isset($metadataSettings['disable'])) {
       $metadataSettings['disable'] = $metadataSettings['disable'] === 1;
     }
-    if (isset($metadataSettings['disable'])) {
+    if (isset($metadataSettings['disableExtraTitleField'])) {
       $metadataSettings['disableExtraTitleField'] = $metadataSettings['disableExtraTitleField'] === 1;
     }
 

From 85d2e2eb75b48c75736bc6a67e5688971ff4a63f Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Tue, 23 Oct 2018 10:56:44 +0200
Subject: [PATCH 15/47] Don't filter params if library or params is not set

---
 h5p.classes.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/h5p.classes.php b/h5p.classes.php
index 3ab11db..4e53fa3 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -2000,6 +2000,10 @@ class H5PCore {
       return $content['filtered'];
     }
 
+    if (!(isset($content['library']) && isset($content['params']))) {
+      return NULL;
+    }
+
     // Validate and filter against main library semantics.
     $validator = new H5PContentValidator($this->h5pF, $this);
     $params = (object) array(

From e316eff18da913e979df15334a683048450aef6f Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Tue, 23 Oct 2018 11:10:06 +0200
Subject: [PATCH 16/47] Don't display empty metadata fields in copyright popup

---
 js/h5p.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/h5p.js b/js/h5p.js
index db262d8..1f9d052 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -1418,7 +1418,7 @@ H5P.MediaCopyright = function (copyright, labels, order, extraFields) {
 
     for (var i = 0; i < order.length; i++) {
       var fieldName = order[i];
-      if (copyright[fieldName] !== undefined) {
+      if (copyright[fieldName] !== undefined && copyright[fieldName] !== '') {
         var humanValue = copyright[fieldName];
         if (fieldName === 'license') {
           humanValue = humanizeLicense(copyright.license, copyright.version);

From 82b50fc2f16a4f85b50939f2d20074dc3c99c62d Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Tue, 23 Oct 2018 11:25:46 +0200
Subject: [PATCH 17/47] Fix code style

---
 js/h5p-confirmation-dialog.js     |  2 +-
 js/h5p-content-type.js            |  2 +-
 js/h5p-content-upgrade-process.js |  8 ++++----
 js/h5p-content-upgrade-worker.js  |  1 +
 js/h5p-content-upgrade.js         |  2 +-
 js/h5p-data-view.js               |  2 +-
 js/h5p-event-dispatcher.js        |  8 ++++----
 js/h5p-library-details.js         | 29 +++++++++++++++--------------
 js/h5p-library-list.js            |  4 ++--
 js/h5p-resizer.js                 |  4 ++--
 js/h5p-utils.js                   |  5 +++--
 js/h5p-x-api-event.js             |  8 ++++----
 js/h5p-x-api.js                   |  2 +-
 js/h5p.js                         | 31 ++++++++++++++++---------------
 14 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/js/h5p-confirmation-dialog.js b/js/h5p-confirmation-dialog.js
index a6dd998..fa623c6 100644
--- a/js/h5p-confirmation-dialog.js
+++ b/js/h5p-confirmation-dialog.js
@@ -351,7 +351,7 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
      *
      * @param {number|null} minHeight
      */
-    this.setViewPortMinimumHeight = function(minHeight) {
+    this.setViewPortMinimumHeight = function (minHeight) {
       var container = document.querySelector('.h5p-container') || document.body;
       container.style.minHeight = (typeof minHeight === 'number') ? (minHeight + 'px') : minHeight;
     };
diff --git a/js/h5p-content-type.js b/js/h5p-content-type.js
index 8be8fcd..47c4d21 100644
--- a/js/h5p-content-type.js
+++ b/js/h5p-content-type.js
@@ -11,7 +11,7 @@
  * @class
  * @augments H5P.EventDispatcher
  */
-H5P.ContentType = function (isRootLibrary, library) {
+H5P.ContentType = function (isRootLibrary) {
 
   function ContentType() {}
 
diff --git a/js/h5p-content-upgrade-process.js b/js/h5p-content-upgrade-process.js
index d50a09c..e683902 100644
--- a/js/h5p-content-upgrade-process.js
+++ b/js/h5p-content-upgrade-process.js
@@ -127,10 +127,10 @@ H5P.ContentUpgradeProcess = (function (Version) {
               }, {metadata: metadata});
             }
             catch (err) {
-              if (console && console.log) {
-                console.log("Error", err.stack);
-                console.log("Error", err.name);
-                console.log("Error", err.message);
+              if (console && console.error) {
+                console.error("Error", err.stack);
+                console.error("Error", err.name);
+                console.error("Error", err.message);
               }
               next(err);
             }
diff --git a/js/h5p-content-upgrade-worker.js b/js/h5p-content-upgrade-worker.js
index 26ad038..3507a35 100644
--- a/js/h5p-content-upgrade-worker.js
+++ b/js/h5p-content-upgrade-worker.js
@@ -1,3 +1,4 @@
+/* global importScripts */
 var H5P = H5P || {};
 importScripts('h5p-version.js', 'h5p-content-upgrade-process.js');
 
diff --git a/js/h5p-content-upgrade.js b/js/h5p-content-upgrade.js
index 9c1e4ce..bb5244a 100644
--- a/js/h5p-content-upgrade.js
+++ b/js/h5p-content-upgrade.js
@@ -1,4 +1,4 @@
-/*jshint -W083 */
+/* global H5PAdminIntegration H5PUtils */
 
 (function ($, Version) {
   var info, $container, librariesCache = {}, scriptsCache = {};
diff --git a/js/h5p-data-view.js b/js/h5p-data-view.js
index 89080e0..2f708f8 100644
--- a/js/h5p-data-view.js
+++ b/js/h5p-data-view.js
@@ -1,3 +1,4 @@
+/* global H5PUtils */
 var H5PDataView = (function ($) {
 
   /**
@@ -198,7 +199,6 @@ var H5PDataView = (function ($) {
    * @param number col ID of column
    */
   H5PDataView.prototype.createFacets = function (input, col) {
-    var self = this;
     var facets = '';
 
     if (input instanceof Array) {
diff --git a/js/h5p-event-dispatcher.js b/js/h5p-event-dispatcher.js
index a6707b4..2027cf7 100644
--- a/js/h5p-event-dispatcher.js
+++ b/js/h5p-event-dispatcher.js
@@ -10,7 +10,7 @@ var H5P = window.H5P = window.H5P || {};
  * @param {boolean} [extras.bubbles]
  * @param {boolean} [extras.external]
  */
-H5P.Event = function(type, data, extras) {
+H5P.Event = function (type, data, extras) {
   this.type = type;
   this.data = data;
   var bubbles = false;
@@ -34,7 +34,7 @@ H5P.Event = function(type, data, extras) {
   /**
    * Prevent this event from bubbling up to parent
    */
-  this.preventBubbling = function() {
+  this.preventBubbling = function () {
     bubbles = false;
   };
 
@@ -44,7 +44,7 @@ H5P.Event = function(type, data, extras) {
    * @returns {boolean}
    *   true if bubbling false otherwise
    */
-  this.getBubbles = function() {
+  this.getBubbles = function () {
     return bubbles;
   };
 
@@ -54,7 +54,7 @@ H5P.Event = function(type, data, extras) {
    * @returns {boolean}
    *   true if external and not already scheduled, otherwise false
    */
-  this.scheduleForExternal = function() {
+  this.scheduleForExternal = function () {
     if (external && !scheduledForExternal) {
       scheduledForExternal = true;
       return true;
diff --git a/js/h5p-library-details.js b/js/h5p-library-details.js
index 77d366b..b5ee012 100644
--- a/js/h5p-library-details.js
+++ b/js/h5p-library-details.js
@@ -1,4 +1,5 @@
-var H5PLibraryDetails= H5PLibraryDetails || {};
+/* global H5PAdminIntegration H5PUtils */
+var H5PLibraryDetails = H5PLibraryDetails || {};
 
 (function ($) {
 
@@ -68,7 +69,7 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
    */
   H5PLibraryDetails.createContentTable = function () {
     // Remove it if it exists:
-    if(H5PLibraryDetails.$contentTable) {
+    if (H5PLibraryDetails.$contentTable) {
       H5PLibraryDetails.$contentTable.remove();
     }
 
@@ -77,10 +78,10 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
     var i = (H5PLibraryDetails.currentPage*H5PLibraryDetails.PAGER_SIZE);
     var lastIndex = (i+H5PLibraryDetails.PAGER_SIZE);
 
-    if(lastIndex > H5PLibraryDetails.currentContent.length) {
+    if (lastIndex > H5PLibraryDetails.currentContent.length) {
       lastIndex = H5PLibraryDetails.currentContent.length;
     }
-    for(; i<lastIndex; i++) {
+    for (; i<lastIndex; i++) {
       var content = H5PLibraryDetails.currentContent[i];
       H5PLibraryDetails.$contentTable.append(H5PUtils.createTableRow(['<a href="' + content.url + '">' + content.title + '</a>']));
     }
@@ -97,7 +98,7 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
     H5PLibraryDetails.$next = $('<button type="button" class="next h5p-admin">></button>');
 
     H5PLibraryDetails.$previous.on('click', function () {
-      if(H5PLibraryDetails.$previous.hasClass('disabled')) {
+      if (H5PLibraryDetails.$previous.hasClass('disabled')) {
         return;
       }
 
@@ -107,7 +108,7 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
     });
 
     H5PLibraryDetails.$next.on('click', function () {
-      if(H5PLibraryDetails.$next.hasClass('disabled')) {
+      if (H5PLibraryDetails.$next.hasClass('disabled')) {
         return;
       }
 
@@ -127,7 +128,7 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
       H5PLibraryDetails.$pagerInfo.hide();
 
       // User has updated the pageNumber
-      var pageNumerUpdated = function() {
+      var pageNumerUpdated = function () {
         var newPageNum = $gotoInput.val()-1;
         var intRegex = /^\d+$/;
 
@@ -135,7 +136,7 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
         H5PLibraryDetails.$pagerInfo.css({display: 'inline-block'});
 
         // Check if input value is valid, and that it has actually changed
-        if(!(intRegex.test(newPageNum) && newPageNum >= 0 && newPageNum < H5PLibraryDetails.getNumPages() && newPageNum != H5PLibraryDetails.currentPage)) {
+        if (!(intRegex.test(newPageNum) && newPageNum >= 0 && newPageNum < H5PLibraryDetails.getNumPages() && newPageNum != H5PLibraryDetails.currentPage)) {
           return;
         }
 
@@ -185,7 +186,7 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
   H5PLibraryDetails.updatePager = function () {
     H5PLibraryDetails.$pagerInfo.css({display: 'inline-block'});
 
-    if(H5PLibraryDetails.getNumPages() > 0) {
+    if (H5PLibraryDetails.getNumPages() > 0) {
       var message = H5PUtils.translateReplace(H5PLibraryDetails.library.translations.pageXOfY, {
         '$x': (H5PLibraryDetails.currentPage+1),
         '$y': H5PLibraryDetails.getNumPages()
@@ -211,7 +212,7 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
       var searchString = $('.h5p-content-search > input').val();
 
       // If search string same as previous, just do nothing
-      if(H5PLibraryDetails.currentFilter === searchString) {
+      if (H5PLibraryDetails.currentFilter === searchString) {
         return;
       }
 
@@ -219,7 +220,7 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
         // If empty search, use the complete list
         H5PLibraryDetails.currentContent = H5PLibraryDetails.library.content;
       }
-      else if(H5PLibraryDetails.filterCache[searchString]) {
+      else if (H5PLibraryDetails.filterCache[searchString]) {
         // If search is cached, no need to filter
         H5PLibraryDetails.currentContent = H5PLibraryDetails.filterCache[searchString];
       }
@@ -227,10 +228,10 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
         var listToFilter = H5PLibraryDetails.library.content;
 
         // Check if we can filter the already filtered results (for performance)
-        if(searchString.length > 1 && H5PLibraryDetails.currentFilter === searchString.substr(0, H5PLibraryDetails.currentFilter.length)) {
+        if (searchString.length > 1 && H5PLibraryDetails.currentFilter === searchString.substr(0, H5PLibraryDetails.currentFilter.length)) {
           listToFilter = H5PLibraryDetails.currentContent;
         }
-        H5PLibraryDetails.currentContent = $.grep(listToFilter, function(content) {
+        H5PLibraryDetails.currentContent = $.grep(listToFilter, function (content) {
           return content.title && content.title.match(new RegExp(searchString, 'i'));
         });
       }
@@ -256,7 +257,7 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
     $('input', H5PLibraryDetails.$search).on('change keypress paste input', function () {
       // Here we start the filtering
       // We wait at least 500 ms after last input to perform search
-      if(inputTimer) {
+      if (inputTimer) {
         clearTimeout(inputTimer);
       }
 
diff --git a/js/h5p-library-list.js b/js/h5p-library-list.js
index 1ee1bc8..344b736 100644
--- a/js/h5p-library-list.js
+++ b/js/h5p-library-list.js
@@ -1,4 +1,4 @@
-/*jshint multistr: true */
+/* global H5PAdminIntegration H5PUtils */
 var H5PLibraryList = H5PLibraryList || {};
 
 (function ($) {
@@ -25,7 +25,7 @@ var H5PLibraryList = H5PLibraryList || {};
    */
   H5PLibraryList.createLibraryList = function (libraries) {
     var t = H5PAdminIntegration.l10n;
-    if(libraries.listData === undefined || libraries.listData.length === 0) {
+    if (libraries.listData === undefined || libraries.listData.length === 0) {
       return $('<div>' + t.NA + '</div>');
     }
 
diff --git a/js/h5p-resizer.js b/js/h5p-resizer.js
index 772cafd..4ed65e0 100644
--- a/js/h5p-resizer.js
+++ b/js/h5p-resizer.js
@@ -21,7 +21,7 @@
     iframe.style.width = '100%';
 
     // Tell iframe that it needs to resize when our window resizes
-    var resize = function (event) {
+    var resize = function () {
       if (iframe.contentWindow) {
         // Limit resize calls to avoid flickering
         respond('resize');
@@ -64,7 +64,7 @@
    * @param {Object} data Payload
    * @param {Function} respond Send a response to the iframe
    */
-  actionHandlers.resize = function (iframe, data, respond) {
+  actionHandlers.resize = function (iframe, data) {
     // Resize iframe so all content is visible. Use scrollHeight to make sure we get everything
     iframe.style.height = data.scrollHeight + 'px';
   };
diff --git a/js/h5p-utils.js b/js/h5p-utils.js
index f47d1b6..b5aa333 100644
--- a/js/h5p-utils.js
+++ b/js/h5p-utils.js
@@ -1,3 +1,4 @@
+/* global H5PAdminIntegration*/
 var H5PUtils = H5PUtils || {};
 
 (function ($) {
@@ -9,7 +10,7 @@ var H5PUtils = H5PUtils || {};
   H5PUtils.createTable = function (headers) {
     var $table = $('<table class="h5p-admin-table' + (H5PAdminIntegration.extraTableClasses !== undefined ? ' ' + H5PAdminIntegration.extraTableClasses : '') + '"></table>');
 
-    if(headers) {
+    if (headers) {
       var $thead = $('<thead></thead>');
       var $tr = $('<tr></tr>');
 
@@ -44,7 +45,7 @@ var H5PUtils = H5PUtils || {};
         };
       }
 
-        $('<td/>', value).appendTo($tr);
+      $('<td/>', value).appendTo($tr);
     });
 
     return $tr;
diff --git a/js/h5p-x-api-event.js b/js/h5p-x-api-event.js
index 4cec937..e012ac1 100644
--- a/js/h5p-x-api-event.js
+++ b/js/h5p-x-api-event.js
@@ -217,7 +217,7 @@ H5P.XAPIEvent.prototype.setActor = function () {
  * @returns {number}
  *   The max score, or null if not defined
  */
-H5P.XAPIEvent.prototype.getMaxScore = function() {
+H5P.XAPIEvent.prototype.getMaxScore = function () {
   return this.getVerifiedStatementValue(['result', 'score', 'max']);
 };
 
@@ -227,7 +227,7 @@ H5P.XAPIEvent.prototype.getMaxScore = function() {
  * @returns {number}
  *   The score, or null if not defined
  */
-H5P.XAPIEvent.prototype.getScore = function() {
+H5P.XAPIEvent.prototype.getScore = function () {
   return this.getVerifiedStatementValue(['result', 'score', 'raw']);
 };
 
@@ -256,7 +256,7 @@ H5P.XAPIEvent.prototype.getContentXAPIId = function (instance) {
 H5P.XAPIEvent.prototype.isFromChild = function () {
   var parentId = this.getVerifiedStatementValue(['context', 'contextActivities', 'parent', 0, 'id']);
   return !parentId || parentId.indexOf('subContentId') === -1;
-}
+};
 
 /**
  * Figure out if a property exists in the statement and return it
@@ -267,7 +267,7 @@ H5P.XAPIEvent.prototype.isFromChild = function () {
  * @returns {*}
  *   The value of the property if it is set, null otherwise.
  */
-H5P.XAPIEvent.prototype.getVerifiedStatementValue = function(keys) {
+H5P.XAPIEvent.prototype.getVerifiedStatementValue = function (keys) {
   var val = this.data.statement;
   for (var i = 0; i < keys.length; i++) {
     if (val[keys[i]] === undefined) {
diff --git a/js/h5p-x-api.js b/js/h5p-x-api.js
index 8a27eb9..66971cd 100644
--- a/js/h5p-x-api.js
+++ b/js/h5p-x-api.js
@@ -92,7 +92,7 @@ H5P.EventDispatcher.prototype.triggerXAPIScored = function (score, maxScore, ver
   this.trigger(event);
 };
 
-H5P.EventDispatcher.prototype.setActivityStarted = function() {
+H5P.EventDispatcher.prototype.setActivityStarted = function () {
   if (this.activityStartTime === undefined) {
     // Don't trigger xAPI events in the editor
     if (this.contentId !== undefined &&
diff --git a/js/h5p.js b/js/h5p.js
index 1f9d052..7f63c1f 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -89,7 +89,7 @@ H5P.init = function (target) {
   }
 
   // H5Ps added in normal DIV.
-  var $containers = H5P.jQuery('.h5p-content:not(.h5p-initialized)', target).each(function () {
+  H5P.jQuery('.h5p-content:not(.h5p-initialized)', target).each(function () {
     var $element = H5P.jQuery(this).addClass('h5p-initialized');
     var $container = H5P.jQuery('<div class="h5p-container"></div>').appendTo($element);
     var contentId = $element.data('content-id');
@@ -301,7 +301,7 @@ H5P.init = function (target) {
         });
 
         // When resize has been prepared tell parent window to resize
-        H5P.communicator.on('resizePrepared', function (data) {
+        H5P.communicator.on('resizePrepared', function () {
           H5P.communicator.send('resize', {
             scrollHeight: document.body.scrollHeight
           });
@@ -494,7 +494,7 @@ H5P.fullScreen = function ($element, instance, exitCallback, body, forceSemiFull
   }
 
   var $container = $element;
-  var $classes, $iframe;
+  var $classes, $iframe, $body;
   if (body === undefined)  {
     $body = H5P.$body;
   }
@@ -1089,7 +1089,7 @@ H5P.findCopyrights = function (info, parameters, contentId, extras) {
     }
   }
 
-  function buildFromMetadata (data, name, contentId) {
+  function buildFromMetadata(data, name, contentId) {
     if (data.metadata) {
       const metadataCopyrights = H5P.buildMetadataCopyrights(data.metadata, name);
       if (metadataCopyrights !== undefined) {
@@ -1105,12 +1105,12 @@ H5P.findCopyrights = function (info, parameters, contentId, extras) {
   }
 };
 
-H5P.buildMetadataCopyrights = function (metadata, contentTypeName) {
+H5P.buildMetadataCopyrights = function (metadata) {
   if (metadata && metadata.license !== undefined && metadata.license !== 'U') {
     var dataset = {
       contentType: metadata.contentType,
       title: metadata.title,
-      author: (metadata.authors && metadata.authors.length > 0) ? metadata.authors.map(function(author) {
+      author: (metadata.authors && metadata.authors.length > 0) ? metadata.authors.map(function (author) {
         return (author.role) ? author.name + ' (' + author.role + ')' : author.name;
       }).join(', ') : undefined,
       source: metadata.source,
@@ -1118,7 +1118,7 @@ H5P.buildMetadataCopyrights = function (metadata, contentTypeName) {
       license: metadata.license,
       version: metadata.licenseVersion,
       licenseExtras: metadata.licenseExtras,
-      changes: (metadata.changes && metadata.changes.length > 0) ? metadata.changes.map(function(change) {
+      changes: (metadata.changes && metadata.changes.length > 0) ? metadata.changes.map(function (change) {
         return change.log + (change.author ? ', ' + change.author : '') + (change.date ? ', ' + change.date : '');
       }).join(' / ') : undefined
     };
@@ -1181,10 +1181,10 @@ H5P.openEmbedDialog = function ($element, embedCode, resizeCode, size) {
     updateEmbed();
 
     // Select text and expand textareas
-    $dialog.find('.h5p-embed-code-container').each(function(index, value) {
-      H5P.jQuery(this).css('height', this.scrollHeight + 'px').focus(function() {
-          H5P.jQuery(this).select();
-        });
+    $dialog.find('.h5p-embed-code-container').each(function () {
+      H5P.jQuery(this).css('height', this.scrollHeight + 'px').focus(function () {
+        H5P.jQuery(this).select();
+      });
     });
     $dialog.find('.h5p-embed-code-container').eq(0).select();
     positionInner();
@@ -1201,7 +1201,7 @@ H5P.openEmbedDialog = function ($element, embedCode, resizeCode, size) {
         $expander.addClass('h5p-open').text(H5P.t('hideAdvanced'));
         $content.show();
       }
-      $dialog.find('.h5p-embed-code-container').each(function(index, value) {
+      $dialog.find('.h5p-embed-code-container').each(function () {
         H5P.jQuery(this).css('height', this.scrollHeight + 'px');
       });
       positionInner();
@@ -1614,7 +1614,8 @@ H5P.Coords = function (x, y, w, h) {
     this.y = x.y;
     this.w = x.w;
     this.h = x.h;
-  } else {
+  }
+  else {
     if (x !== undefined) {
       this.x = x;
     }
@@ -1870,7 +1871,7 @@ H5P.on = function (instance, eventType, handler) {
  * @returns {string} UUID
  */
 H5P.createUUID = function () {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(char) {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (char) {
     var random = Math.random()*16|0, newChar = char === 'x' ? random : (random&0x3|0x8);
     return newChar.toString(16);
   });
@@ -2098,7 +2099,7 @@ H5P.createTitle = function (rawTitle, maxLength) {
     }
 
     preloadedData[options.subContentId][dataId] = data;
-    contentUserDataAjax(contentId, dataId, options.subContentId, function (error, data) {
+    contentUserDataAjax(contentId, dataId, options.subContentId, function (error) {
       if (options.errorCallback && error) {
         options.errorCallback(error);
       }

From f661248b5a85a39a1dff5b99c71c40b24a23b591 Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Tue, 23 Oct 2018 13:15:55 +0200
Subject: [PATCH 18/47] HFP-2329 Skip emty metadata fields for h5p.json

---
 h5p.classes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 4e53fa3..b0099bc 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1647,7 +1647,7 @@ Class H5PExport {
     );
 
     foreach(array('authors', 'source', 'license', 'licenseVersion', 'licenseExtras' ,'yearFrom', 'yearTo', 'changes', 'authorComments') as $field) {
-      if (isset($content['metadata'][$field])) {
+      if (isset($content['metadata'][$field]) && $content['metadata'][$field] !== '') {
         if (($field !== 'authors' && $field !== 'changes') || (count($content['metadata'][$field]) > 0)) {
           $h5pJson[$field] = json_decode(json_encode($content['metadata'][$field], TRUE));
         }

From 2e305ded71ecabd723b59fe570cfbfc953514272 Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Tue, 23 Oct 2018 14:59:50 +0200
Subject: [PATCH 19/47] HFP-2328 Reset metadata fields if needed

---
 h5p-metadata.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/h5p-metadata.class.php b/h5p-metadata.class.php
index a7c42ac..6884e0e 100644
--- a/h5p-metadata.class.php
+++ b/h5p-metadata.class.php
@@ -85,13 +85,13 @@ abstract class H5PMetadata {
         continue;
       }
 
-      if (isset($metadata[$key])) {
+      if ($metadata[$key] === null || isset($metadata[$key])) {
         $value = $metadata[$key];
         $db_field_name = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $key));
 
         switch ($config['type']) {
           case 'text':
-            if (strlen($value) > $config['maxLength']) {
+            if ($value !== null && strlen($value) > $config['maxLength']) {
               $value = mb_substr($value, 0, $config['maxLength']);
             }
             $types[] = '%s';
@@ -103,7 +103,7 @@ abstract class H5PMetadata {
             break;
 
           case 'json':
-            $value = json_encode($value);
+            $value = ($value !== null) ? json_encode($value) : null;
             $types[] = '%s';
             break;
         }

From fd2ac997ef87a6fdbdfe61ba05d1cc125cf571c6 Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Fri, 26 Oct 2018 08:45:20 +0200
Subject: [PATCH 20/47] HFP-2328 Fix bug

---
 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 6884e0e..3a504e3 100644
--- a/h5p-metadata.class.php
+++ b/h5p-metadata.class.php
@@ -85,7 +85,7 @@ abstract class H5PMetadata {
         continue;
       }
 
-      if ($metadata[$key] === null || isset($metadata[$key])) {
+      if (array_key_exists($key, $metadata)) {
         $value = $metadata[$key];
         $db_field_name = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $key));
 

From 066ea94b1169b529f8309de14f696444206e67dd Mon Sep 17 00:00:00 2001
From: Oliver Tacke <o.tacke@posteo.de>
Date: Fri, 26 Oct 2018 09:35:24 +0200
Subject: [PATCH 21/47] Fix warning in toDBArray()

Prevent accessing keys of metadata that don't exist
---
 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 6884e0e..80d8eff 100644
--- a/h5p-metadata.class.php
+++ b/h5p-metadata.class.php
@@ -85,7 +85,7 @@ abstract class H5PMetadata {
         continue;
       }
 
-      if ($metadata[$key] === null || isset($metadata[$key])) {
+      if (array_key_exists($key, $metadata) && ($metadata[$key] === null || isset($metadata[$key]))) {
         $value = $metadata[$key];
         $db_field_name = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $key));
 

From 715fa6f80311adf605898fcf2dfed690b6cc8c4e Mon Sep 17 00:00:00 2001
From: Paal Joergensen <pal.jorgensen@gmail.com>
Date: Thu, 1 Nov 2018 14:42:12 +0100
Subject: [PATCH 22/47] HFP-2378 Add option to overwrite unset metadata fields

---
 h5p-metadata.class.php | 59 ++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/h5p-metadata.class.php b/h5p-metadata.class.php
index 3a504e3..8462fa4 100644
--- a/h5p-metadata.class.php
+++ b/h5p-metadata.class.php
@@ -64,15 +64,16 @@ abstract class H5PMetadata {
       ',"authorComments":' . (isset($content->author_comments) ? json_encode($content->author_comments) : 'null') . '}';
   }
 
-
   /**
    * Make the metadata into an associative array keyed by the property names
    * @param mixed $metadata Array or object containing metadata
    * @param bool $include_title
+   * @param bool $include_missing For metadata fields not being set, skip 'em.
+   *                             Relevant for content upgrade
    * @param array $types
    * @return array
    */
-  public static function toDBArray($metadata, $include_title = true, &$types = array()) {
+  public static function toDBArray($metadata, $include_title = true, $include_missing = true, &$types = array()) {
     $fields = array();
 
     if (!is_array($metadata)) {
@@ -81,35 +82,43 @@ abstract class H5PMetadata {
 
     foreach (self::$fields as $key => $config) {
 
+      // Ignore title?
       if ($key === 'title' && !$include_title) {
         continue;
       }
 
-      if (array_key_exists($key, $metadata)) {
-        $value = $metadata[$key];
-        $db_field_name = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $key));
+      $exists = array_key_exists($key, $metadata);
 
-        switch ($config['type']) {
-          case 'text':
-            if ($value !== null && strlen($value) > $config['maxLength']) {
-              $value = mb_substr($value, 0, $config['maxLength']);
-            }
-            $types[] = '%s';
-            break;
-
-          case 'int':
-            $value = ($value !== null) ? intval($value): null;
-            $types[] = '%d';
-            break;
-
-          case 'json':
-            $value = ($value !== null) ? json_encode($value) : null;
-            $types[] = '%s';
-            break;
-        }
-
-        $fields[$db_field_name] = $value;
+      // Don't include missing fields
+      if (!$include_missing && !exists) {
+        continue;
       }
+
+      $value = $exists ? $metadata[$key] : null;
+
+      // lowerCamelCase to snake_case
+      $db_field_name = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $key));
+
+      switch ($config['type']) {
+        case 'text':
+          if ($value !== null && strlen($value) > $config['maxLength']) {
+            $value = mb_substr($value, 0, $config['maxLength']);
+          }
+          $types[] = '%s';
+          break;
+
+        case 'int':
+          $value = ($value !== null) ? intval($value) : null;
+          $types[] = '%d';
+          break;
+
+        case 'json':
+          $value = ($value !== null) ? json_encode($value) : null;
+          $types[] = '%s';
+          break;
+      }
+
+      $fields[$db_field_name] = $value;
     }
 
     return $fields;

From db022830a645dca8273d1fe42cd41ea58f5e608a Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Fri, 2 Nov 2018 09:54:23 +0100
Subject: [PATCH 23/47] 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 <pal.jorgensen@gmail.com>
Date: Fri, 2 Nov 2018 10:03:58 +0100
Subject: [PATCH 24/47] 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 <frode.andre.petterson@gmail.com>
Date: Fri, 2 Nov 2018 10:14:35 +0100
Subject: [PATCH 25/47] 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 <frode.andre.petterson@gmail.com>
Date: Fri, 2 Nov 2018 10:25:35 +0100
Subject: [PATCH 26/47] 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;
       }
 

From f7f2479b2aa568cb5b379377ddf732371b7ab062 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Thu, 8 Nov 2018 12:36:30 +0100
Subject: [PATCH 27/47] Fix new style array into old style array

---
 h5p.classes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index d1c05fa..9482217 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -4362,7 +4362,7 @@ class H5PContentValidator {
           (object) array(
             'type' => 'optgroup',
             'label' => $this->h5pF->t('Creative Commons'),
-            'options' => [
+            'options' => array(
               (object) array(
                 'value' => 'CC BY',
                 'label' => $this->h5pF->t('Attribution (CC BY)'),
@@ -4401,7 +4401,7 @@ class H5PContentValidator {
                 'value' => 'CC PDM',
                 'label' => $this->h5pF->t('Public Domain Mark (PDM)')
               ),
-            ]
+            )
           ),
           (object) array(
             'value' => 'GNU GPL',

From ec9127d2452698a09432f2dbb7bb133acb332864 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Fri, 16 Nov 2018 12:39:57 +0100
Subject: [PATCH 28/47] JI-915 Fix embed resizing issue with Chrome

---
 js/h5p-resizer.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/h5p-resizer.js b/js/h5p-resizer.js
index 4ed65e0..ed78724 100644
--- a/js/h5p-resizer.js
+++ b/js/h5p-resizer.js
@@ -20,6 +20,10 @@
     // Make iframe responsive
     iframe.style.width = '100%';
 
+    // Bugfix for Chrome: Force update of iframe width. If this is not done the
+    // document size may not be updated before the content resizes.
+    iframe.getBoundingClientRect();
+
     // Tell iframe that it needs to resize when our window resizes
     var resize = function () {
       if (iframe.contentWindow) {

From 132f25e14a5be5bedd6ef6cd91df3a346580a538 Mon Sep 17 00:00:00 2001
From: Oliver Tacke <o.tacke@posteo.de>
Date: Fri, 23 Nov 2018 13:05:23 +0100
Subject: [PATCH 29/47] Make eslint happy

---
 js/h5p.js | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/js/h5p.js b/js/h5p.js
index 7f63c1f..a315eb7 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -143,10 +143,9 @@ H5P.init = function (target) {
           '</div>' +
         '</div>')
         .prependTo($container)
-          .children()
-          .click(function () {
-            H5P.fullScreen($container, instance);
-          })
+        .children().click(function () {
+          H5P.fullScreen($container, instance);
+        })
         .keydown(function (e) {
           if (e.which === 32 || e.which === 13) {
             H5P.fullScreen($container, instance);
@@ -214,7 +213,7 @@ H5P.init = function (target) {
 
     // Auto save current state if supported
     if (H5PIntegration.saveFreq !== false && (
-        instance.getCurrentState instanceof Function ||
+      instance.getCurrentState instanceof Function ||
         typeof instance.getCurrentState === 'function')) {
 
       var saveTimer, save = function () {
@@ -931,20 +930,15 @@ H5P.Dialog = function (name, title, content, $element) {
     .click(function () {
       self.close();
     })
-    .children('.h5p-inner')
-      .click(function () {
-        return false;
-      })
-      .find('.h5p-close')
-        .click(function () {
-          self.close();
-        })
-        .end()
-      .find('a')
-        .click(function (e) {
-          e.stopPropagation();
-        })
-      .end()
+    .children('.h5p-inner').click(function () {
+      return false;
+    })
+    .find('.h5p-close').click(function () {
+      self.close();
+    }).end()
+    .find('a').click(function (e) {
+      e.stopPropagation();
+    }).end()
     .end();
 
   /**

From 2be06b2eb915d8fdc2514240b3725ffb54f036aa Mon Sep 17 00:00:00 2001
From: Oliver Tacke <o.tacke@posteo.de>
Date: Fri, 23 Nov 2018 13:10:07 +0100
Subject: [PATCH 30/47] HFP-2396 Add aria-label to elements with role button

---
 js/h5p-action-bar.js | 2 +-
 js/h5p.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/h5p-action-bar.js b/js/h5p-action-bar.js
index 3af1a43..c144b79 100644
--- a/js/h5p-action-bar.js
+++ b/js/h5p-action-bar.js
@@ -51,7 +51,7 @@ H5P.ActionBar = (function ($, EventDispatcher) {
           }
         },
         appendTo: $actions
-      });
+      }).attr('aria-label', H5P.t(type + 'Description'));
 
       hasActions = true;
     };
diff --git a/js/h5p.js b/js/h5p.js
index a315eb7..f3a5575 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -923,7 +923,7 @@ H5P.Dialog = function (name, title, content, $element) {
                               <div class="h5p-inner">\
                                 <h2>' + title + '</h2>\
                                 <div class="h5p-scroll-content">' + content + '</div>\
-                                <div class="h5p-close" role="button" tabindex="0" title="' + H5P.t('close') + '">\
+                                <div class="h5p-close" role="button" tabindex="0" aria-label="' + H5P.t('close') + '" title="' + H5P.t('close') + '">\
                               </div>\
                             </div>')
     .insertAfter($element)

From 48f3805f9441606586a58a9c2bff6d4adcd30ba4 Mon Sep 17 00:00:00 2001
From: Oliver Tacke <o.tacke@posteo.de>
Date: Fri, 23 Nov 2018 15:13:41 +0100
Subject: [PATCH 31/47] HFP-2398 Remove aria-label in action bar

WAIA states it is *not* supposed to be used if there's a visible label
---
 js/h5p-action-bar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/h5p-action-bar.js b/js/h5p-action-bar.js
index c144b79..3af1a43 100644
--- a/js/h5p-action-bar.js
+++ b/js/h5p-action-bar.js
@@ -51,7 +51,7 @@ H5P.ActionBar = (function ($, EventDispatcher) {
           }
         },
         appendTo: $actions
-      }).attr('aria-label', H5P.t(type + 'Description'));
+      });
 
       hasActions = true;
     };

From 152dfc0fb25b5d3a941a4826e4a083620e8fd479 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Fri, 23 Nov 2018 15:47:26 +0100
Subject: [PATCH 32/47] HFP-2433 Add CSS needed for Editor semi-fullscreen

---
 styles/h5p.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/styles/h5p.css b/styles/h5p.css
index e3ece5c..c8beedc 100644
--- a/styles/h5p.css
+++ b/styles/h5p.css
@@ -455,3 +455,19 @@ div.h5p-fullscreen {
 .h5p-dialog-ok-button:active {
   background: #eeffee;
 }
+
+/* This is loaded as part of Core and not Editor since this needs to be outside the editor iframe */
+.h5peditor-semi-fullscreen {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 101;
+}
+iframe.h5peditor-semi-fullscreen {
+  background: #fff;
+  z-index: 100001;
+}

From 0678126f82708598a545e330c857d6346c722f21 Mon Sep 17 00:00:00 2001
From: Oliver Tacke <o.tacke@posteo.de>
Date: Fri, 23 Nov 2018 16:40:18 +0100
Subject: [PATCH 33/47] HFP-2398 Add aria-label to fullscreen buttons

---
 js/h5p.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/h5p.js b/js/h5p.js
index f3a5575..eb685c5 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -139,6 +139,7 @@ H5P.init = function (target) {
           '<div role="button" ' +
                 'tabindex="0" ' +
                 'class="h5p-enable-fullscreen" ' +
+                'aria-label="' + H5P.t('fullscreen') +
                 'title="' + H5P.t('fullscreen') + '">' +
           '</div>' +
         '</div>')
@@ -568,7 +569,7 @@ H5P.fullScreen = function ($element, instance, exitCallback, body, forceSemiFull
     }
 
     before('h5p-semi-fullscreen');
-    var $disable = H5P.jQuery('<div role="button" tabindex="0" class="h5p-disable-fullscreen" title="' + H5P.t('disableFullscreen') + '"></div>').appendTo($container.find('.h5p-content-controls'));
+    var $disable = H5P.jQuery('<div role="button" tabindex="0" class="h5p-disable-fullscreen" title="' + H5P.t('disableFullscreen') + '" aria-label="' + H5P.t('disableFullscreen') + '"></div>').appendTo($container.find('.h5p-content-controls'));
     var keyup, disableSemiFullscreen = H5P.exitFullScreen = function () {
       if (prevViewportContent) {
         // Use content from the previous viewport tag

From b43051c7858ac0c350281339a76fcf1b8d343124 Mon Sep 17 00:00:00 2001
From: thomasmars <thomasmars87@gmail.com>
Date: Thu, 20 Dec 2018 15:07:40 +0100
Subject: [PATCH 34/47] HFP-15474 Fix xAPI errors when previewing content

---
 js/h5p-x-api-event.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/h5p-x-api-event.js b/js/h5p-x-api-event.js
index e012ac1..4d67b84 100644
--- a/js/h5p-x-api-event.js
+++ b/js/h5p-x-api-event.js
@@ -239,7 +239,7 @@ H5P.XAPIEvent.prototype.getScore = function () {
  */
 H5P.XAPIEvent.prototype.getContentXAPIId = function (instance) {
   var xAPIId;
-  if (instance.contentId && H5PIntegration && H5PIntegration.contents) {
+  if (instance.contentId && H5PIntegration && H5PIntegration.contents && H5PIntegration.contents['cid-' + instance.contentId]) {
     xAPIId =  H5PIntegration.contents['cid-' + instance.contentId].url;
     if (instance.subContentId) {
       xAPIId += '?subContentId=' +  instance.subContentId;

From 2b474699b27eab3b6ff9b1516d084b9392f58ab8 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Thu, 20 Dec 2018 16:17:14 +0100
Subject: [PATCH 35/47] HFP-1145 Remove base64 data decoding since we now use
 Blob

---
 h5p-default-storage.class.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/h5p-default-storage.class.php b/h5p-default-storage.class.php
index 26e3e01..56f0e46 100644
--- a/h5p-default-storage.class.php
+++ b/h5p-default-storage.class.php
@@ -311,13 +311,7 @@ class H5PDefaultStorage implements \H5PFileStorage {
     // Add filename to path
     $path .= '/' . $file->getName();
 
-    $fileData = $file->getData();
-    if ($fileData) {
-      file_put_contents($path, $fileData);
-    }
-    else {
-      copy($_FILES['file']['tmp_name'], $path);
-    }
+    copy($_FILES['file']['tmp_name'], $path);
 
     return $file;
   }

From 6f4c4d9cc3f097a70fbe4755d7d9cd6ae47ff75a Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Thu, 20 Dec 2018 16:17:27 +0100
Subject: [PATCH 36/47] HFP-1145 Bump Core API version due to improvements

---
 h5p.classes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 9482217..d23394e 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1842,7 +1842,7 @@ class H5PCore {
 
   public static $coreApi = array(
     'majorVersion' => 1,
-    'minorVersion' => 19
+    'minorVersion' => 20
   );
   public static $styles = array(
     'styles/h5p.css',

From f19ca764619f8e27f44844bbf5cca0db5cc79602 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Thu, 3 Jan 2019 12:46:16 +0100
Subject: [PATCH 37/47] HFP-2508 Fix reset of all subContentIds on Copy/Paste

---
 js/h5p.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/js/h5p.js b/js/h5p.js
index eb685c5..bbca97f 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -2256,7 +2256,6 @@ H5P.createTitle = function (rawTitle, maxLength) {
    * Get item from the H5P Clipboard.
    *
    * @private
-   * @param {boolean} [skipUpdateFileUrls]
    * @return {Object}
    */
   var parseClipboard = function () {
@@ -2274,8 +2273,8 @@ H5P.createTitle = function (rawTitle, maxLength) {
       return;
     }
 
-    // Update file URLs
-    updateFileUrls(clipboardData.specific, function (path) {
+    // Update file URLs and reset content Ids
+    recursiveUpdate(clipboardData.specific, function (path) {
       var isTmpFile = (path.substr(-4, 4) === '#tmp');
       if (!isTmpFile && clipboardData.contentId) {
         // Comes from existing content
@@ -2296,22 +2295,20 @@ H5P.createTitle = function (rawTitle, maxLength) {
     if (clipboardData.generic) {
       // Use reference instead of key
       clipboardData.generic = clipboardData.specific[clipboardData.generic];
-
-      // Avoid multiple content with same ID
-      delete clipboardData.generic.subContentId;
     }
 
     return clipboardData;
   };
 
   /**
-   * Update file URLs. Useful when copying content.
+   * Update file URLs and reset content IDs.
+   * Useful when copying content.
    *
    * @private
    * @param {object} params Reference
    * @param {function} handler Modifies the path to work when pasted
    */
-  var updateFileUrls = function (params, handler) {
+  var recursiveUpdate = function (params, handler) {
     for (var prop in params) {
       if (params.hasOwnProperty(prop) && params[prop] instanceof Object) {
         var obj = params[prop];
@@ -2319,7 +2316,11 @@ H5P.createTitle = function (rawTitle, maxLength) {
           obj.path = handler(obj.path);
         }
         else {
-          updateFileUrls(obj, handler);
+          if (obj.library !== undefined && obj.subContentId !== undefined) {
+            // Avoid multiple content with same ID
+            delete obj.subContentId;
+          }
+          recursiveUpdate(obj, handler);
         }
       }
     }

From 9a7a3438444c23c782188b3c05d51b873f5f3908 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Thu, 3 Jan 2019 12:50:44 +0100
Subject: [PATCH 38/47] HFP-2508 Remove caching of pasted content

Objects can not be referenced by multiple widgets when used in the editor
---
 js/h5p.js | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/js/h5p.js b/js/h5p.js
index bbca97f..4787d48 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -2207,23 +2207,13 @@ H5P.createTitle = function (rawTitle, maxLength) {
     H5P.setClipboard(clipboardItem);
   };
 
-  /**
-   * This is a cache for pasted data to prevent parsing multiple times.
-   * @type {Object}
-   */
-  var parsedClipboard = null;
-
   /**
    * Retrieve parsed clipboard data.
    *
    * @return {Object}
    */
   H5P.getClipboard = function () {
-    if (!parsedClipboard) {
-      parsedClipboard = parseClipboard();
-    }
-
-    return parsedClipboard;
+    return parseClipboard();
   };
 
   /**
@@ -2234,9 +2224,6 @@ H5P.createTitle = function (rawTitle, maxLength) {
   H5P.setClipboard = function (clipboardItem) {
     localStorage.setItem('h5pClipboard', JSON.stringify(clipboardItem));
 
-    // Clear cache
-    parsedClipboard = null;
-
     // Trigger an event so all 'Paste' buttons may be enabled.
     H5P.externalDispatcher.trigger('datainclipboard', {reset: false});
   };
@@ -2332,9 +2319,6 @@ H5P.createTitle = function (rawTitle, maxLength) {
     window.addEventListener('storage', function (event) {
       // Pick up clipboard changes from other tabs
       if (event.key === 'h5pClipboard') {
-        // Clear cache
-        parsedClipboard = null;
-
         // Trigger an event so all 'Paste' buttons may be enabled.
         H5P.externalDispatcher.trigger('datainclipboard', {reset: event.newValue === null});
       }

From 8d3094996929ad3906eb5a034e5ff057d0eda185 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Wed, 9 Jan 2019 11:51:17 +0100
Subject: [PATCH 39/47] Revert "Make eslint happy"

This reverts commit 132f25e14a5be5bedd6ef6cd91df3a346580a538.
---
 js/h5p.js | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/js/h5p.js b/js/h5p.js
index 4787d48..c25520c 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -144,9 +144,10 @@ H5P.init = function (target) {
           '</div>' +
         '</div>')
         .prependTo($container)
-        .children().click(function () {
-          H5P.fullScreen($container, instance);
-        })
+          .children()
+          .click(function () {
+            H5P.fullScreen($container, instance);
+          })
         .keydown(function (e) {
           if (e.which === 32 || e.which === 13) {
             H5P.fullScreen($container, instance);
@@ -214,7 +215,7 @@ H5P.init = function (target) {
 
     // Auto save current state if supported
     if (H5PIntegration.saveFreq !== false && (
-      instance.getCurrentState instanceof Function ||
+        instance.getCurrentState instanceof Function ||
         typeof instance.getCurrentState === 'function')) {
 
       var saveTimer, save = function () {
@@ -931,15 +932,20 @@ H5P.Dialog = function (name, title, content, $element) {
     .click(function () {
       self.close();
     })
-    .children('.h5p-inner').click(function () {
-      return false;
-    })
-    .find('.h5p-close').click(function () {
-      self.close();
-    }).end()
-    .find('a').click(function (e) {
-      e.stopPropagation();
-    }).end()
+    .children('.h5p-inner')
+      .click(function () {
+        return false;
+      })
+      .find('.h5p-close')
+        .click(function () {
+          self.close();
+        })
+        .end()
+      .find('a')
+        .click(function (e) {
+          e.stopPropagation();
+        })
+      .end()
     .end();
 
   /**

From c2d7b987cc971c5be1553da1ae84e93d1cc019b7 Mon Sep 17 00:00:00 2001
From: Oliver Tacke <o.tacke@posteo.de>
Date: Fri, 11 Jan 2019 14:09:56 +0100
Subject: [PATCH 40/47] Fix missing closing div for close button

---
 js/h5p.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/h5p.js b/js/h5p.js
index c25520c..9727ece 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -925,7 +925,7 @@ H5P.Dialog = function (name, title, content, $element) {
                               <div class="h5p-inner">\
                                 <h2>' + title + '</h2>\
                                 <div class="h5p-scroll-content">' + content + '</div>\
-                                <div class="h5p-close" role="button" tabindex="0" aria-label="' + H5P.t('close') + '" title="' + H5P.t('close') + '">\
+                                <div class="h5p-close" role="button" tabindex="0" aria-label="' + H5P.t('close') + '" title="' + H5P.t('close') + '"></div>\
                               </div>\
                             </div>')
     .insertAfter($element)

From bfb7b5600c963c1825fcbe7f247b4d584cedb58e Mon Sep 17 00:00:00 2001
From: Oliver Tacke <o.tacke@posteo.de>
Date: Fri, 11 Jan 2019 14:52:10 +0100
Subject: [PATCH 41/47] Fix missing closing div for close button

---
 js/h5p.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/h5p.js b/js/h5p.js
index c25520c..9727ece 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -925,7 +925,7 @@ H5P.Dialog = function (name, title, content, $element) {
                               <div class="h5p-inner">\
                                 <h2>' + title + '</h2>\
                                 <div class="h5p-scroll-content">' + content + '</div>\
-                                <div class="h5p-close" role="button" tabindex="0" aria-label="' + H5P.t('close') + '" title="' + H5P.t('close') + '">\
+                                <div class="h5p-close" role="button" tabindex="0" aria-label="' + H5P.t('close') + '" title="' + H5P.t('close') + '"></div>\
                               </div>\
                             </div>')
     .insertAfter($element)

From b6080a1a00476ff9a8abad187ac40c7e39da38fe Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Mon, 14 Jan 2019 15:26:27 +0100
Subject: [PATCH 42/47] Update FS comment

---
 js/h5p.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/h5p.js b/js/h5p.js
index c25520c..949945a 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -75,8 +75,9 @@ H5P.init = function (target) {
      * @type {boolean}
      */
     H5P.fullscreenSupported = !(H5P.isFramed && H5P.externalEmbed !== false) || !!(document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled);
-    // We should consider document.msFullscreenEnabled when they get their
-    // element sizing corrected. Ref. https://connect.microsoft.com/IE/feedback/details/838286/ie-11-incorrectly-reports-dom-element-sizes-in-fullscreen-mode-when-fullscreened-element-is-within-an-iframe
+    // -We should consider document.msFullscreenEnabled when they get their
+    // -element sizing corrected. Ref. https://connect.microsoft.com/IE/feedback/details/838286/ie-11-incorrectly-reports-dom-element-sizes-in-fullscreen-mode-when-fullscreened-element-is-within-an-iframe
+    // Update: Seems to be no need as they've moved on to Webkit
   }
 
   // Deprecated variable, kept to maintain backwards compatability

From 9cf3f4aa7f3e28197b3aa366fed3a3d0971a7848 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Tue, 22 Jan 2019 15:27:27 +0100
Subject: [PATCH 43/47] JI-942 Add restict save when a higher version is
 available

---
 ...ntent-outdated-library-exception.class.php |  3 +
 h5p-default-storage.class.php                 | 18 ++++++
 h5p-file-storage.interface.php                | 10 ++++
 h5p.classes.php                               | 55 ++++++++++++++++---
 js/h5p-version.js                             | 21 +++++--
 5 files changed, 94 insertions(+), 13 deletions(-)
 create mode 100644 exceptions/h5p-save-content-outdated-library-exception.class.php

diff --git a/exceptions/h5p-save-content-outdated-library-exception.class.php b/exceptions/h5p-save-content-outdated-library-exception.class.php
new file mode 100644
index 0000000..dab8ed2
--- /dev/null
+++ b/exceptions/h5p-save-content-outdated-library-exception.class.php
@@ -0,0 +1,3 @@
+<?php
+
+class H5PSaveContentOutdatedLibraryException extends Exception { }
diff --git a/h5p-default-storage.class.php b/h5p-default-storage.class.php
index 56f0e46..485cbdc 100644
--- a/h5p-default-storage.class.php
+++ b/h5p-default-storage.class.php
@@ -458,6 +458,24 @@ class H5PDefaultStorage implements \H5PFileStorage {
     return file_exists($filePath);
   }
 
+  /**
+   * Check if upgrades script exist for library.
+   *
+   * @param string $machineName
+   * @param int $majorVersion
+   * @param int $minorVersion
+   * @return string Relative path
+   */
+  public function getUpgradeScript($machineName, $majorVersion, $minorVersion) {
+    $upgrades = "/libraries/{$machineName}-{$majorVersion}.{$minorVersion}/upgrades.js";
+    if (file_exists($this->path . $upgrades)) {
+      return $upgrades;
+    }
+    else {
+      return NULL;
+    }
+  }
+
   /**
    * Recursive function for copying directories.
    *
diff --git a/h5p-file-storage.interface.php b/h5p-file-storage.interface.php
index 4dbdbc6..4bb1368 100644
--- a/h5p-file-storage.interface.php
+++ b/h5p-file-storage.interface.php
@@ -199,4 +199,14 @@ interface H5PFileStorage {
    * @return bool
    */
   public function hasPresave($libraryName, $developmentPath = null);
+
+  /**
+   * Check if upgrades script exist for library.
+   *
+   * @param string $machineName
+   * @param int $majorVersion
+   * @param int $minorVersion
+   * @return string Relative path
+   */
+  public function getUpgradeScript($machineName, $majorVersion, $minorVersion);
 }
diff --git a/h5p.classes.php b/h5p.classes.php
index d23394e..d2a7d27 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -614,6 +614,14 @@ interface H5PFrameworkInterface {
    *  containing the new content type cache that should replace the old one.
    */
   public function replaceContentTypeCache($contentTypeCache);
+
+  /**
+   * Checks if the given library has a higher version.
+   *
+   * @param array $library
+   * @return boolean
+   */
+  public function libraryHasUpgrade($library);
 }
 
 /**
@@ -919,11 +927,27 @@ class H5PValidator {
       }
 
       if (!empty($missingLibraries)) {
-        foreach ($missingLibraries as $libString => $library) {
-          $this->h5pF->setErrorMessage($this->h5pF->t('Missing required library @library', array('@library' => $libString)), 'missing-required-library');
+        // We still have missing libraries, check if our main library has an upgrade (BUT only if we has content)
+        $mainDependency = NULL;
+        if (!$skipContent) {
+          foreach ($mainH5PData['preloadedDependencies'] as $dep) {
+            if ($dep['machineName'] === $mainH5PData['mainLibrary']) {
+              $mainDependency = $dep;
+            }
+          }
         }
-        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."));
+
+        if ($skipContent || !$mainDependency || !$this->h5pF->libraryHasUpgrade(array(
+              'machineName' => $mainDependency['mainLibrary'],
+              'majorVersion' => $mainDependency['majorVersion'],
+              'minorVersion' => $mainDependency['minorVersion']
+            ))) {
+          foreach ($missingLibraries as $libString => $library) {
+            $this->h5pF->setErrorMessage($this->h5pF->t('Missing required library @library', array('@library' => $libString)), 'missing-required-library');
+          }
+          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."));
+          }
         }
       }
       $valid = empty($missingLibraries) && $valid;
@@ -1394,15 +1418,23 @@ class H5PStorage {
       if (isset($options['disable'])) {
         $content['disable'] = $options['disable'];
       }
-      $content['id'] = $this->h5pC->saveContent($content, $contentMainId);
-      $this->contentId = $content['id'];
 
       try {
+        // Store content in database
+        $content['id'] = $this->h5pC->saveContent($content, $contentMainId);
+        $this->contentId = $content['id'];
+
         // Save content folder contents
         $this->h5pC->fs->saveContent($current_path, $content);
       }
       catch (Exception $e) {
-        $this->h5pF->setErrorMessage($e->getMessage(), 'save-content-failed');
+        if ($e instanceof H5PSaveContentOutdatedLibraryException) {
+          $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
@@ -1922,8 +1954,6 @@ class H5PCore {
     $this->relativePathRegExp = '/^((\.\.\/){1,2})(.*content\/)?(\d+|editor)\/(.+)$/';
   }
 
-
-
   /**
    * Save content and clear cache.
    *
@@ -1932,6 +1962,13 @@ class H5PCore {
    * @return int Content ID
    */
   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'])) {
       $this->h5pF->updateContent($content, $contentMainId);
     }
diff --git a/js/h5p-version.js b/js/h5p-version.js
index 7089b5a..8457341 100644
--- a/js/h5p-version.js
+++ b/js/h5p-version.js
@@ -7,11 +7,24 @@ H5P.Version = (function () {
    * @param {String} version
    */
   function Version(version) {
-    var versionSplit = version.split('.', 3);
 
-    // Public
-    this.major =+ versionSplit[0];
-    this.minor =+ versionSplit[1];
+    if (typeof version === 'string') {
+      // Name version string (used by content upgrade)
+      var versionSplit = version.split('.', 3);
+      this.major =+ versionSplit[0];
+      this.minor =+ versionSplit[1];
+    }
+    else {
+      // Library objects (used by editor)
+      if (version.localMajorVersion !== undefined) {
+        this.major =+ version.localMajorVersion;
+        this.minor =+ version.localMinorVersion;
+      }
+      else {
+        this.major =+ version.majorVersion;
+        this.minor =+ version.minorVersion;
+      }
+    }
 
     /**
      * Public. Custom string for this object.

From c9e1ac934714b50167f1884d21e235fed8aa5e01 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Mon, 28 Jan 2019 16:01:08 +0100
Subject: [PATCH 44/47] JI-942 Add better error handling for Content Upgrade

---
 h5p.classes.php                   |  3 +-
 js/h5p-content-upgrade-process.js | 14 +++++++--
 js/h5p-content-upgrade.js         | 48 +++++++++++++++++++++----------
 3 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index d2a7d27..8ea9e7a 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -537,9 +537,10 @@ interface H5PFrameworkInterface {
    * Get number of contents using library as main library.
    *
    * @param int $libraryId
+   * @param array $skip
    * @return int
    */
-  public function getNumContent($libraryId);
+  public function getNumContent($libraryId, $skip = NULL);
 
   /**
    * Determines if content slug is used.
diff --git a/js/h5p-content-upgrade-process.js b/js/h5p-content-upgrade-process.js
index e683902..6954622 100644
--- a/js/h5p-content-upgrade-process.js
+++ b/js/h5p-content-upgrade-process.js
@@ -27,6 +27,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
     self.loadLibrary = loadLibrary;
     self.upgrade(name, oldVersion, newVersion, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
       if (err) {
+        err.id = id;
         return done(err);
       }
 
@@ -176,7 +177,11 @@ H5P.ContentUpgradeProcess = (function (Version) {
             var usedVer = new Version(usedLib[1]);
             var availableVer = new Version(availableLib[1]);
             if (usedVer.major > availableVer.major || (usedVer.major === availableVer.major && usedVer.minor >= availableVer.minor)) {
-              return done(); // Larger or same version that's available
+              return done({
+                type: 'errorTooHighVersion',
+                used: usedLib[0] + ' ' + usedVer,
+                supported: availableLib[0] + ' ' + availableVer
+              }); // Larger or same version that's available
             }
 
             // A newer version is available, upgrade params
@@ -192,7 +197,12 @@ H5P.ContentUpgradeProcess = (function (Version) {
             });
           }
         }
-        done();
+
+        // Content type was not supporte by the higher version
+        done({
+          type: 'errorNotSupported',
+          used: usedLib[0] + ' ' + usedVer
+        });
         break;
 
       case 'group':
diff --git a/js/h5p-content-upgrade.js b/js/h5p-content-upgrade.js
index bb5244a..168c694 100644
--- a/js/h5p-content-upgrade.js
+++ b/js/h5p-content-upgrade.js
@@ -1,7 +1,7 @@
 /* global H5PAdminIntegration H5PUtils */
 
 (function ($, Version) {
-  var info, $container, librariesCache = {}, scriptsCache = {};
+  var info, $log, $container, librariesCache = {}, scriptsCache = {};
 
   // Initialize
   $(document).ready(function () {
@@ -9,7 +9,9 @@
     info = H5PAdminIntegration.libraryInfo;
 
     // Get and reset container
-    $container = $('#h5p-admin-container').html('<p>' + info.message + '</p>');
+    const $wrapper = $('#h5p-admin-container').html('');
+    $log = $('<ul class="content-upgrade-log"></ul>').appendTo($wrapper);
+    $container = $('<div><p>' + info.message + '</p></div>').appendTo($wrapper);
 
     // Make it possible to select version
     var $version = $(getVersionSelect(info.versions)).appendTo($container);
@@ -120,9 +122,7 @@
       },
       error: function (error) {
         self.printError(error.err);
-
-        // Stop everything
-        self.terminate();
+        self.workDone(error.id, null, this);
       },
       loadLibrary: function (details) {
         var worker = this;
@@ -184,7 +184,7 @@
       self.token = inData.token;
 
       // Start processing
-      self.processBatch(inData.params);
+      self.processBatch(inData.params, inData.skipped);
     });
   };
 
@@ -202,11 +202,12 @@
    *
    * @param {Object} parameters
    */
-  ContentUpgrade.prototype.processBatch = function (parameters) {
+  ContentUpgrade.prototype.processBatch = function (parameters, skipped) {
     var self = this;
 
     // Track upgraded params
     self.upgraded = {};
+    self.skipped = skipped;
 
     // Track current batch
     self.parameters = parameters;
@@ -276,7 +277,7 @@
       }, function done(err, result) {
         if (err) {
           self.printError(err);
-          return ;
+          result = null;
         }
 
         self.workDone(id, result);
@@ -291,7 +292,12 @@
     var self = this;
 
     self.working--;
-    self.upgraded[id] = result;
+    if (result === null) {
+      self.skipped.push(id);
+    }
+    else {
+      self.upgraded[id] = result;
+    }
 
     // Update progress message
     self.throbber.setProgress(Math.round((info.total - self.left + self.current) / (info.total / 100)) + ' %');
@@ -302,6 +308,7 @@
       self.nextBatch({
         libraryId: self.version.libraryId,
         token: self.token,
+        skipped: JSON.stringify(self.skipped),
         params: JSON.stringify(self.upgraded)
       });
     }
@@ -410,14 +417,25 @@
   ContentUpgrade.prototype.printError = function (error) {
     var self = this;
 
-    if (error.type === 'errorParamsBroken') {
-      error = info.errorContent.replace('%id', error.id) + ' ' + info.errorParamsBroken;
-    }
-    else if (error.type === 'scriptMissing') {
-      error = info.errorScript.replace('%lib', error.library);
+    switch (error.type) {
+      case 'errorParamsBroken':
+        error = info.errorContent.replace('%id', error.id) + ' ' + info.errorParamsBroken;
+        break;
+
+      case 'scriptMissing':
+        error = info.errorScript.replace('%lib', error.library);
+        break;
+
+      case 'errorTooHighVersion':
+        error = info.errorContent.replace('%id', error.id) + ' ' + info.errorTooHighVersion.replace('%used', error.used).replace('%supported', error.supported);
+        break;
+
+      case 'errorNotSupported':
+        error = info.errorContent.replace('%id', error.id) + ' ' + info.errorNotSupported.replace('%used', error.used);
+        break;
     }
 
-    self.setStatus('<p>' + info.error + '<br/>' + error + '</p>');
+    $('<li>' + info.error + '<br/>' + error + '</li>').appendTo($log);
   };
 
 })(H5P.jQuery, H5P.Version);

From f96d04cc27d08ea7675251fc1055c979f99cedb1 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Fri, 1 Feb 2019 13:03:27 +0100
Subject: [PATCH 45/47] JI-942 Add missing library error message

---
 js/h5p-content-upgrade-process.js | 6 ++++++
 js/h5p-content-upgrade.js         | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/js/h5p-content-upgrade-process.js b/js/h5p-content-upgrade-process.js
index 6954622..cab1dfd 100644
--- a/js/h5p-content-upgrade-process.js
+++ b/js/h5p-content-upgrade-process.js
@@ -54,6 +54,12 @@ H5P.ContentUpgradeProcess = (function (Version) {
       if (err) {
         return done(err);
       }
+      if (library.semantics === null) {
+        return done({
+          type: 'libraryMissing',
+          library: library.name + ' ' + library.version.major + '.' + library.version.minor
+        });
+      }
 
       // Run upgrade routines on params
       self.processParams(library, oldVersion, newVersion, params, metadata, function (err, params, metadata) {
diff --git a/js/h5p-content-upgrade.js b/js/h5p-content-upgrade.js
index 168c694..9dc066c 100644
--- a/js/h5p-content-upgrade.js
+++ b/js/h5p-content-upgrade.js
@@ -422,6 +422,10 @@
         error = info.errorContent.replace('%id', error.id) + ' ' + info.errorParamsBroken;
         break;
 
+      case 'libraryMissing':
+        error = info.errorLibrary.replace('%lib', error.library);
+        break;
+
       case 'scriptMissing':
         error = info.errorScript.replace('%lib', error.library);
         break;

From d1dd47be6f93424c03ecfe6a79c51aa212dbd1ce Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Tue, 5 Feb 2019 13:15:50 +0100
Subject: [PATCH 46/47] JI-942 Fix auto content upgrade to work with Drupal
 module

---
 ...ntent-outdated-library-exception.class.php |  3 ---
 h5p.classes.php                               | 21 +++----------------
 styles/h5p-admin.css                          |  3 +++
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 exceptions/h5p-save-content-outdated-library-exception.class.php

diff --git a/exceptions/h5p-save-content-outdated-library-exception.class.php b/exceptions/h5p-save-content-outdated-library-exception.class.php
deleted file mode 100644
index dab8ed2..0000000
--- a/exceptions/h5p-save-content-outdated-library-exception.class.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class H5PSaveContentOutdatedLibraryException extends Exception { }
diff --git a/h5p.classes.php b/h5p.classes.php
index 8ea9e7a..491ea50 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1419,23 +1419,15 @@ class H5PStorage {
       if (isset($options['disable'])) {
         $content['disable'] = $options['disable'];
       }
+      $content['id'] = $this->h5pC->saveContent($content, $contentMainId);
+      $this->contentId = $content['id'];
 
       try {
-        // Store content in database
-        $content['id'] = $this->h5pC->saveContent($content, $contentMainId);
-        $this->contentId = $content['id'];
-
         // Save content folder contents
         $this->h5pC->fs->saveContent($current_path, $content);
       }
       catch (Exception $e) {
-        if ($e instanceof H5PSaveContentOutdatedLibraryException) {
-          $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');
+        $this->h5pF->setErrorMessage($e->getMessage(), 'save-content-failed');
       }
 
       // Remove temp content folder
@@ -1963,13 +1955,6 @@ class H5PCore {
    * @return int Content ID
    */
   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'])) {
       $this->h5pF->updateContent($content, $contentMainId);
     }
diff --git a/styles/h5p-admin.css b/styles/h5p-admin.css
index 100dfea..372da79 100644
--- a/styles/h5p-admin.css
+++ b/styles/h5p-admin.css
@@ -339,3 +339,6 @@ button.h5p-admin.disabled:hover {
 .h5p-data-view .h5p-facet-tag > span:active {
   color: #d20000;
 }
+.content-upgrade-log {
+  color: red;
+}

From 415e1010646df7a99a9ed1cddcf009e8beb48a29 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Tue, 5 Feb 2019 17:14:34 +0100
Subject: [PATCH 47/47] JI-942 Add extra check for library upload

---
 h5p.classes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 491ea50..d3e7ee1 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -930,7 +930,7 @@ class H5PValidator {
       if (!empty($missingLibraries)) {
         // We still have missing libraries, check if our main library has an upgrade (BUT only if we has content)
         $mainDependency = NULL;
-        if (!$skipContent) {
+        if (!$skipContent && !empty($mainH5PData)) {
           foreach ($mainH5PData['preloadedDependencies'] as $dep) {
             if ($dep['machineName'] === $mainH5PData['mainLibrary']) {
               $mainDependency = $dep;