From ea722126ffc4020642d8062c6d66eb40f563440e Mon Sep 17 00:00:00 2001
From: Oliver Tacke <o.tacke@posteo.de>
Date: Mon, 4 Jun 2018 15:44:04 +0200
Subject: [PATCH] HFP-1905 Fix property naming and validation defaults

Fix property naming for more harmony (and peace in the world)
Fix validation on uploading content by adding Author as a role
---
 h5p.classes.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 44ea65d..67a6a7b 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -624,7 +624,7 @@ class H5PValidator {
     'author' => '/^.{1,255}$/',
     'authors' => array(
       'name' => '/^.{1,255}$/',
-      'role' => '/^(Illustrator|Designer|Photographer)$/',
+      'role' => '/^(Author|Illustrator|Designer|Photographer)$/',
     ),
     'license' => '/^(CC BY|CC BY-SA|CC BY-ND|CC BY-NC|CC BY-NC-SA|CC BY-NC-ND|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)$/',
     'licenseVersion' => '/^(1.0|2.0|2.5|3.0|4.0)$/',
@@ -4255,12 +4255,12 @@ class H5PContentValidator {
         'fields'=> array(
           (object) array(
             'label' => "Author's name",
-            'name' => "authorName",
+            'name' => "name",
             'optional' => TRUE,
             'type' => "text"
           ),
           (object) array(
-            'name' => 'authorRole',
+            'name' => 'role',
             'type' => 'select',
             'label' => $this->h5pF->t("Author's role"),
             'default' => 'Author',