EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved regexp from editor to core 

HFJ-2099
pull/25/head
Frode Petterson 2016-07-29 14:15:00 +02:00
parent 1ef52dfafe
commit 832aebf5e0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
h5p.classes.php
View File

@ -1738,6 +1738,9 @@ class H5PCore {
$this->detectSiteType(); $this->detectSiteType();
$this->fullPluginPath = preg_replace('/\/[^\/]+[\/]?$/', '' , dirname(__FILE__)); $this->fullPluginPath = preg_replace('/\/[^\/]+[\/]?$/', '' , dirname(__FILE__));
// Standard regex for converting copied files paths
$this->relativePathRegExp = '/^((\.\.\/){1,2})(.*content\/)?(\d+|editor)\/(.+)$/';
} }
/** /**
@ -2938,8 +2941,8 @@ class H5PContentValidator {
private function _validateFilelike(&$file, $semantics, $typeValidKeys = array()) { private function _validateFilelike(&$file, $semantics, $typeValidKeys = array()) {
// Do not allow to use files from other content folders. // Do not allow to use files from other content folders.
$matches = array(); $matches = array();
if (preg_match('/^(\.\.\/){1,2}(.*content\/)?(\d+|editor)\/(.+)$/', $file->path, $matches)) { if (preg_match($this->h5pC->relativePathRegExp, $file->path, $matches)) {
$file->path = $matches[4]; $file->path = $matches[5];
} }
// Make sure path and mime does not have any special chars // Make sure path and mime does not have any special chars