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

Merge pull request #28 from limikael/master 

don't fail silently in createExportFile
pull/29/head
Frode Petterson 2016-09-30 11:31:17 +02:00 committed by GitHub
parent 1c5b9707e5 ce796cf0cf
commit 0a9aa5a783
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,11 +132,18 @@ class H5PDefaultStorage implements \H5PFileStorage {
* Path on file system to temporary export file. * Path on file system to temporary export file.
* @param string $filename * @param string $filename
* Name of export file. * Name of export file.
* @throws Exception Unable to save the file
*/ */
public function saveExport($source, $filename) { public function saveExport($source, $filename) {
$this->deleteExport($filename); $this->deleteExport($filename);
self::dirReady("{$this->path}/exports");
copy($source, "{$this->path}/exports/{$filename}"); if (!self::dirReady("{$this->path}/exports")) {
throw new Exception("Unable to create directory for H5P export file.");
}
if (!copy($source, "{$this->path}/exports/{$filename}")) {
throw new Exception("Unable to save H5P export file.");
}
} }
/** /**

1
h5p.classes.php
View File

@ -1595,6 +1595,7 @@ Class H5PExport {
} }
catch (Exception $e) { catch (Exception $e) {
$this->h5pF->setErrorMessage($this->h5pF->t($e->getMessage())); $this->h5pF->setErrorMessage($this->h5pF->t($e->getMessage()));
return false;
} }
unlink($tmpFile); unlink($tmpFile);