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

HFP-967 Revert a revert 

Ensures that latest code from stable is added.
pull/10/merge
Timothy Lim 2017-04-25 16:19:53 +02:00
parent 56e453f6c1
commit fb76e09e8c
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
h5p.classes.php
View File

@ -567,7 +567,7 @@ interface H5PFrameworkInterface {
/** /**
* Will trigger after the export file is created. * Will trigger after the export file is created.
*/ */
public function afterExportCreated(); public function afterExportCreated($content, $filename);
/** /**
* Check if user has permissions to an action * Check if user has permissions to an action
@ -1610,16 +1610,19 @@ Class H5PExport {
foreach ($files as $file) { foreach ($files as $file) {
// Please note that the zip format has no concept of folders, we must // Please note that the zip format has no concept of folders, we must
// use forward slashes to separate our directories. // use forward slashes to separate our directories.
if (file_exists(realpath($file->absolutePath))) {
$zip->addFile(realpath($file->absolutePath), $file->relativePath); $zip->addFile(realpath($file->absolutePath), $file->relativePath);
} }
}
// Close zip and remove tmp dir // Close zip and remove tmp dir
$zip->close(); $zip->close();
H5PCore::deleteFileTree($tmpPath); H5PCore::deleteFileTree($tmpPath);
$filename = $content['slug'] . '-' . $content['id'] . '.h5p';
try { try {
// Save export // Save export
$this->h5pC->fs->saveExport($tmpFile, $content['slug'] . '-' . $content['id'] . '.h5p'); $this->h5pC->fs->saveExport($tmpFile, $filename);
} }
catch (Exception $e) { catch (Exception $e) {
$this->h5pF->setErrorMessage($this->h5pF->t($e->getMessage())); $this->h5pF->setErrorMessage($this->h5pF->t($e->getMessage()));
@ -1627,7 +1630,7 @@ Class H5PExport {
} }
unlink($tmpFile); unlink($tmpFile);
$this->h5pF->afterExportCreated(); $this->h5pF->afterExportCreated($content, $filename);
return true; return true;
} }
@ -2471,12 +2474,13 @@ class H5PCore {
$this->h5pF->setInfoMessage( $this->h5pF->setInfoMessage(
$this->h5pF->t('Your site was successfully registered with the H5P Hub.') $this->h5pF->t('Your site was successfully registered with the H5P Hub.')
); );
$this->h5pF->setInfoMessage( // TODO: Uncomment when key is once again available in H5P Settings
$this->h5pF->t('You have been provided a unique key that identifies you with the Hub when receiving new updates. The key is available for viewing in the "H5P Settings" page.') // $this->h5pF->setInfoMessage(
); // $this->h5pF->t('You have been provided a unique key that identifies you with the Hub when receiving new updates. The key is available for viewing in the "H5P Settings" page.')
// );
} }
if ($this->h5pF->getOption('h5p_send_usage_statistics', TRUE)) { if ($this->h5pF->getOption('send_usage_statistics', TRUE)) {
$siteData = array_merge( $siteData = array_merge(
$registrationData, $registrationData,
array( array(
@ -2776,10 +2780,6 @@ class H5PCore {
* @param null|int $status_code Http response code * @param null|int $status_code Http response code
*/ */
private static function printJson($data, $status_code = NULL) { private static function printJson($data, $status_code = NULL) {
if ($status_code !== NULL) {
http_response_code($status_code);
}
header('Cache-Control: no-cache'); header('Cache-Control: no-cache');
header('Content-type: application/json; charset=utf-8'); header('Content-type: application/json; charset=utf-8');
print json_encode($data); print json_encode($data);
@ -2835,28 +2835,18 @@ class H5PCore {
public function updateContentTypeCache($postData = NULL) { public function updateContentTypeCache($postData = NULL) {
$interface = $this->h5pF; $interface = $this->h5pF;
// Set uuid // Make sure data is sent!
if (!$postData || !isset($postData['uuid'])) { if (!isset($postData) || !isset($postData['uuid'])) {
$site_uuid = $this->h5pF->getOption('site_uuid', '');
// Register site with site uuid if we don't already have it
// and try to update content type cache again when this is done
if (empty($site_uuid)) {
return $this->fetchLibrariesMetadata(); return $this->fetchLibrariesMetadata();
} }
$postData = array(
'uuid' => $site_uuid
);
}
$postData['current_cache'] = $this->h5pF->getOption('content_type_cache_updated_at', 0); $postData['current_cache'] = $this->h5pF->getOption('content_type_cache_updated_at', 0);
$protocol = (extension_loaded('openssl') ? 'https' : 'http'); $protocol = (extension_loaded('openssl') ? 'https' : 'http');
$endpoint = H5PHubEndpoints::CONTENT_TYPES; $endpoint = H5PHubEndpoints::CONTENT_TYPES;
$data = $interface->fetchExternalData("{$protocol}://{$endpoint}", $postData); $data = $interface->fetchExternalData("{$protocol}://{$endpoint}", $postData);
if (! $this->h5pF->getOption('h5p_hub_is_enabled', TRUE)) { if (! $this->h5pF->getOption('hub_is_enabled', TRUE)) {
return TRUE; return TRUE;
} }
@ -3029,7 +3019,7 @@ class H5PContentValidator {
public $h5pF; public $h5pF;
public $h5pC; public $h5pC;
private $typeMap, $libraries, $dependencies, $nextWeight; private $typeMap, $libraries, $dependencies, $nextWeight;
private static $allowed_styleable_tags = array('span', 'p', 'div', 'h1', 'h2', 'tr'); private static $allowed_styleable_tags = array('span', 'p', 'div','h1','h2','h3', 'td');
/** /**
* Constructor for the H5PContentValidator * Constructor for the H5PContentValidator