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

Use library id instead of machine_name to name library folders

namespaces
falcon 2012-12-04 22:35:54 +01:00
parent 19665aba5a
commit bd3d755ba7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
h5p.classes.php
View File

@ -262,7 +262,7 @@ class h5pValidator {
$missing = array(); $missing = array();
foreach ($dependencies as $dependency) { foreach ($dependencies as $dependency) {
if (isset($libraries[$dependency['machineName']])) { if (isset($libraries[$dependency['machineName']])) {
if ($this->h5pC->isSameVersion($libraries[$dependency['machineName']], $dependency)) { if (!$this->h5pC->isSameVersion($libraries[$dependency['machineName']], $dependency)) {
$missing[$dependency['machineName']] = $dependency; $missing[$dependency['machineName']] = $dependency;
} }
} }
@ -407,7 +407,6 @@ class h5pValidator {
return $this->isValidH5pDataOptions($h5pData, $requirements, $library_name); return $this->isValidH5pDataOptions($h5pData, $requirements, $library_name);
} }
if (isset($h5pData[$required])) { if (isset($h5pData[$required])) {
// TODO: Make sure this works with multiple css files.
$valid = $this->isValidRequirement($h5pData[$required], $requirement, $library_name, $required) && $valid; $valid = $this->isValidRequirement($h5pData[$required], $requirement, $library_name, $required) && $valid;
} }
else { else {
@ -494,12 +493,12 @@ class h5pSaver {
public function savePackage($contentId) { public function savePackage($contentId) {
foreach ($this->h5pC->librariesJsonData as $key => &$value) { foreach ($this->h5pC->librariesJsonData as $key => &$value) {
if (!$this->h5pF->isStoredLibrary($key, key($value))) { if (!$this->h5pF->isStoredLibrary($key, key($value))) {
$current_path = $this->h5pF->getUploadedH5pFolderPath() . DIRECTORY_SEPARATOR . $key;
$destination_path = $this->h5pF->getH5pPath() . DIRECTORY_SEPARATOR . 'libraries' . DIRECTORY_SEPARATOR . $key;
rename($current_path, $destination_path);
$this->h5pF->storeLibraryData(end($value)); $this->h5pF->storeLibraryData(end($value));
$current_path = $this->h5pF->getUploadedH5pFolderPath() . DIRECTORY_SEPARATOR . $key;
$destination_path = $this->h5pF->getH5pPath() . DIRECTORY_SEPARATOR . 'libraries' . DIRECTORY_SEPARATOR . $value['libraryId'];
rename($current_path, $destination_path);
// @todo: Handle cases where we have a copy of this library, but of an older version // @todo: Handle cases where we have a copy of this library, but of an older version
} }
} }