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

Be able to skip cache busting on dependency files. 

Renamed tmp to temp.
Suppress errors when moving content folder.
Made sure loaded development libraries bring their semantics.
namespaces
Frode Petterson 2014-05-08 16:28:36 +02:00
parent 48b07c46f5
commit 86441f4bec
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
h5p.classes.php
View File

@ -1027,7 +1027,7 @@ class H5PStorage {
// Move the content folder // Move the content folder
$destination_path = $contents_path . DIRECTORY_SEPARATOR . $contentId; $destination_path = $contents_path . DIRECTORY_SEPARATOR . $contentId;
rename($current_path, $destination_path); @rename($current_path, $destination_path);
// Save the content library dependencies // Save the content library dependencies
$this->h5pF->saveLibraryUsage($contentId, $librariesInUse); $this->h5pF->saveLibraryUsage($contentId, $librariesInUse);
@ -1122,7 +1122,7 @@ Class H5PExport {
*/ */
public function getExportPath($content) { public function getExportPath($content) {
$h5pDir = $this->h5pF->getH5pPath() . DIRECTORY_SEPARATOR; $h5pDir = $this->h5pF->getH5pPath() . DIRECTORY_SEPARATOR;
$tempPath = $h5pDir . 'tmp' . DIRECTORY_SEPARATOR . $content['id']; $tempPath = $h5pDir . 'temp' . DIRECTORY_SEPARATOR . $content['id'];
$zipPath = $h5pDir . 'exports' . DIRECTORY_SEPARATOR . $content['id'] . '.h5p'; $zipPath = $h5pDir . 'exports' . DIRECTORY_SEPARATOR . $content['id'] . '.h5p';
// Check if h5p-package already exists. // Check if h5p-package already exists.
@ -1344,7 +1344,7 @@ class H5PCore {
* @param array $dependencies * @param array $dependencies
* @return array files. * @return array files.
*/ */
public function getDependenciesFiles($dependencies) { public function getDependenciesFiles($dependencies, $addCacheBuster = TRUE) {
$files = array( $files = array(
'scripts' => array(), 'scripts' => array(),
'styles' => array() 'styles' => array()
@ -1356,7 +1356,7 @@ class H5PCore {
$dependency['preloadedCss'] = explode(',', $dependency['preloadedCss']); $dependency['preloadedCss'] = explode(',', $dependency['preloadedCss']);
} }
$version = "?ver={$dependency['majorVersion']}.{$dependency['minorVersion']}.{$dependency['patchVersion']}"; $version = $addCacheBuster ? "?ver={$dependency['majorVersion']}.{$dependency['minorVersion']}.{$dependency['patchVersion']}" : '';
if (!empty($dependency['preloadedJs']) && $dependency['preloadedJs'][0] !== '') { if (!empty($dependency['preloadedJs']) && $dependency['preloadedJs'][0] !== '') {
foreach ($dependency['preloadedJs'] as $file) { foreach ($dependency['preloadedJs'] as $file) {
$file = trim(is_array($file) ? $file['path'] : $file) . $version; $file = trim(is_array($file) ? $file['path'] : $file) . $version;
@ -1408,6 +1408,9 @@ class H5PCore {
if ($this->development_mode & H5PDevelopment::MODE_LIBRARY) { if ($this->development_mode & H5PDevelopment::MODE_LIBRARY) {
// Try to load from dev // Try to load from dev
$library = $this->h5pD->getLibrary($name, $majorVersion, $minorVersion); $library = $this->h5pD->getLibrary($name, $majorVersion, $minorVersion);
if ($library !== NULL) {
$library['semantics'] = $this->h5pD->getSemantics($name, $majorVersion, $minorVersion);
}
} }
if ($library === NULL) { if ($library === NULL) {