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

Merge remote-tracking branch 'origin/master'

h5p-prerequisites-validator
Thomas Marstrander 2016-04-25 13:17:56 +02:00
parent 8a6733ceb4 1623f6701e
commit 05dfc9c374
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
h5p-default-storage.class.php
View File

@ -247,6 +247,16 @@ class H5PDefaultStorage implements \H5PFileStorage {
}
}
/**
* Read file content of given file and then return it.
*
* @param string $file_path
* @return string
*/
public function getContent($file_path) {
return file_get_contents($this->path . $file_path);
}
/**
* Recursive function for copying directories.
*

8
h5p-file-storage.interface.php
View File

@ -117,4 +117,12 @@ interface H5PFileStorage {
* The hash keys of removed files
*/
public function deleteCachedAssets($keys);
/**
* Read file content of given file and then return it.
*
* @param string $file_path
* @return string contents
*/
public function getContent($file_path);
}

2
h5p.classes.php
View File

@ -2470,7 +2470,7 @@ class H5PCore {
// Determine remote/visitor origin
if ($type === 'network' ||
($type === 'local' && !preg_match('/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/i', $_SERVER['REMOTE_ADDR']))) {
if (filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) {
if (isset($_SERVER['REMOTE_ADDR']) && filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) {
// Internet
$this->h5pF->setOption('site_type', 'internet');
}