From 62b6c498c3e58c67d52e59cdf94a2e14eac3132b Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Thu, 17 Jan 2013 23:39:24 +0100
Subject: [PATCH] Begin adding support for external resources

---
 h5p.classes.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 4440cb8..63ce31e 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -136,6 +136,13 @@ class h5pValidator {
       'majorVersion' => '/^[0-9]{1,5}$/',
       'minorVersion' => '/^[0-9]{1,5}$/',
     ),
+    'externalResources' => array(
+      'machineName' => '/^[\w0-9\-\.]{1,255}$/i',
+      'majorVersion' => '/^[0-9]{1,5}$/',
+      'minorVersion' => '/^[0-9]{1,5}$/',
+      'url' => '/^http:\/\/[a-z_\-\.0-9]+\.[a-z]{2, 10}$/i',
+      'type' => '/^(css|js)$/',
+    ),
     'w' => '/^[0-9]{1,4}$/',
     'h' => '/^[0-9]{1,4}$/',
     'metaKeywords' => '/^.{1,}$/',
@@ -149,7 +156,7 @@ class h5pValidator {
     'minorVersion' => '/^[0-9]{1,5}$/',
     'patchVersion' => '/^[0-9]{1,5}$/',
     'machineName' => '/^[\w0-9\-\.]{1,255}$/i',
-    'runable' => '/^(0|1)$/'
+    'runable' => '/^(0|1)$/',
   );
 
   private $libraryOptional  = array(
@@ -167,6 +174,13 @@ class h5pValidator {
       'majorVersion' => '/^[0-9]{1,5}$/',
       'minorVersion' => '/^[0-9]{1,5}$/',
     ),
+    'externalResources' => array(
+      'machineName' => '/^[\w0-9\-\.]{1,255}$/i',
+      'majorVersion' => '/^[0-9]{1,5}$/',
+      'minorVersion' => '/^[0-9]{1,5}$/',
+      'url' => '/^http:\/\/[a-z_\-\.0-9]+\.[a-z]{2, 10}$/i',
+      'type' => '/^(css|js)$/',
+    ),
     'preloadedJs' => array(
       'path' => '/^((\\\|\/)?[a-z_\-\s0-9]+)+\.js$/i',
     ),
@@ -268,16 +282,9 @@ class h5pValidator {
         }
       }
 
-      // elseif (strpos($file, '.') !== FALSE) {
-      //   // Illegal file fond. This is ignored.
-      //   continue;
-      // }
-
       // The rest should be library folders
       else {
          if (!is_dir($file_path)) {
-          // $this->h5pF->setErrorMessage($this->h5pF->t('Invalid library folder: %name', array('%name' => $file)));
-          // $valid = FALSE;
           // Ignore this. Probably a file that shouldn't have been included.
           continue;
         }