Commit 7cd1c525 authored by Dan Poltawski's avatar Dan Poltawski
Browse files

Merge branch 'w31_MDL-17830_m24_zipresult' of git://github.com/skodak/moodle

parents b95744a3 f6b49abf
......@@ -140,6 +140,30 @@ class zip_packer_testcase extends advanced_testcase {
foreach($archivefiles as $file) {
$this->assertArrayHasKey($file->pathname, $this->files);
}
// Test invalid files parameter.
$archive = "$CFG->tempdir/archive2.zip";
$this->assertFalse(file_exists($archive));
$this->assertFalse(file_exists(__DIR__.'/xx/yy/ee.txt'));
$files = array('xtest.txt'=>__DIR__.'/xx/yy/ee.txt');
ob_start();
$result = $packer->archive_to_pathname($files, $archive);
$d = ob_end_clean();
$this->assertTrue($d !== '');
$this->assertFalse($result);
$this->assertTrue(file_exists(__DIR__.'/fixtures/test.txt'));
$files = array();
$files['""""'] = null; // Invalid directory name.
$files['test.txt'] = __DIR__.'/fixtures/test.txt';
ob_start();
$result = $packer->archive_to_pathname($files, $archive);
$d = ob_end_clean();
$this->assertTrue($d !== '');
$this->assertTrue($result);
@unlink($archive);
}
/**
......
......@@ -100,26 +100,44 @@ class zip_packer extends file_packer {
return false;
}
$result = false; // One processed file or dir means success here.
foreach ($files as $archivepath => $file) {
$archivepath = trim($archivepath, '/');
if (is_null($file)) {
// empty directories have null as content
$ziparch->add_directory($archivepath.'/');
if ($ziparch->add_directory($archivepath.'/')) {
$result = true;
} else {
debugging("Can not zip '$archivepath' directory", DEBUG_DEVELOPER);
}
} else if (is_string($file)) {
$this->archive_pathname($ziparch, $archivepath, $file);
if ($this->archive_pathname($ziparch, $archivepath, $file)) {
$result = true;
} else {
debugging("Can not zip '$archivepath' file", DEBUG_DEVELOPER);
}
} else if (is_array($file)) {
$content = reset($file);
$ziparch->add_file_from_string($archivepath, $content);
if ($ziparch->add_file_from_string($archivepath, $content)) {
$result = true;
} else {
debugging("Can not zip '$archivepath' file", DEBUG_DEVELOPER);
}
} else {
$this->archive_stored($ziparch, $archivepath, $file);
if ($this->archive_stored($ziparch, $archivepath, $file)) {
$result = true;
} else {
debugging("Can not zip '$archivepath' file", DEBUG_DEVELOPER);
}
}
}
return $ziparch->close();
return ($ziparch->close() && $result);
}
/**
......@@ -128,12 +146,16 @@ class zip_packer extends file_packer {
* @param zip_archive $ziparch zip archive instance
* @param string $archivepath file path to archive
* @param stored_file $file stored_file object
* @return bool success
*/
private function archive_stored($ziparch, $archivepath, $file) {
$file->archive_file($ziparch, $archivepath);
$result = $file->archive_file($ziparch, $archivepath);
if (!$result) {
return false;
}
if (!$file->is_directory()) {
return;
return true;
}
$baselength = strlen($file->get_filepath());
......@@ -147,8 +169,11 @@ class zip_packer extends file_packer {
if (!$file->is_directory()) {
$path = $path.$file->get_filename();
}
// Ignore result here, partial zipping is ok for now.
$file->archive_file($ziparch, $path);
}
return true;
}
/**
......@@ -157,18 +182,18 @@ class zip_packer extends file_packer {
* @param zip_archive $ziparch zip archive instance
* @param string $archivepath file path to archive
* @param string $file path name of the file
* @return bool success
*/
private function archive_pathname($ziparch, $archivepath, $file) {
if (!file_exists($file)) {
return;
return false;
}
if (is_file($file)) {
if (!is_readable($file)) {
return;
return false;
}
$ziparch->add_file_from_pathname($archivepath, $file);
return;
return $ziparch->add_file_from_pathname($archivepath, $file);
}
if (is_dir($file)) {
if ($archivepath !== '') {
......@@ -183,7 +208,7 @@ class zip_packer extends file_packer {
$this->archive_pathname($ziparch, $newpath, $file->getPathname());
}
unset($files); //release file handles
return;
return true;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment