From 0884bf369a0ca027f9c418461d9f42c004c439e7 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Tue, 3 Dec 2013 11:36:31 +0100
Subject: [PATCH] Added more attrs for videos.

---
 fonts/fontawesome-webfont.eot  | Bin
 fonts/fontawesome-webfont.svg  |   0
 fonts/fontawesome-webfont.ttf  | Bin
 fonts/fontawesome-webfont.woff | Bin
 h5p.classes.php                |  27 +++++++++++++++++++++++++--
 5 files changed, 25 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 fonts/fontawesome-webfont.eot
 mode change 100755 => 100644 fonts/fontawesome-webfont.svg
 mode change 100755 => 100644 fonts/fontawesome-webfont.ttf
 mode change 100755 => 100644 fonts/fontawesome-webfont.woff

diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
old mode 100755
new mode 100644
diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
old mode 100755
new mode 100644
diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
old mode 100755
new mode 100644
diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
old mode 100755
new mode 100644
diff --git a/h5p.classes.php b/h5p.classes.php
index 3c27445..8ceb611 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1641,9 +1641,32 @@ class H5PContentValidator {
     // code.
     $validkeys = array_merge(array('path', 'mime'), $typevalidkeys);
     if (isset($semantics->extraAttributes)) {
-      $validkeys = array_merge($validkeys, $semantics->extraAttributes);
+      $validkeys = array_merge($validkeys, $semantics->extraAttributes); // TODO: Validate extraAttributes
     }
     $this->filterParams($file, $validkeys);
+    
+    if (isset($file->width)) {
+      $file->width = intval($file->width);
+    }
+    
+    if (isset($file->height)) {
+      $file->height = intval($file->height);
+    }
+    
+    if (isset($file->codecs)) {
+      $file->codecs = htmlspecialchars($file->codecs, ENT_QUOTES, 'UTF-8', FALSE);
+    }
+    
+    if (isset($file->quality)) {
+      if (!is_object($file->quality) || !isset($file->quality->level) || !isset($file->quality->label)) {
+        unset($file->quality);
+      }
+      else {
+        $this->filterParams($file->quality, array('level', 'label'));
+        $file->quality->level = intval($file->quality->level);
+        $file->quality->label = htmlspecialchars($file->quality->label, ENT_QUOTES, 'UTF-8', FALSE);
+      }
+    }
   }
 
   /**
@@ -1665,7 +1688,7 @@ class H5PContentValidator {
    */
   public function validateVideo(&$video, $semantics) {
     foreach ($video as &$variant) {
-      $this->_validateFilelike($variant, $semantics, array('width', 'height'));
+      $this->_validateFilelike($variant, $semantics, array('width', 'height', 'codecs', 'quality'));
     }
   }