Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure temp file in pclzipAddFile() removed

Browse Source 
Make pclzipAddFile() similar to pclzipAddFromString() in removing
temporary files.
This commit is contained in:
Andrew Collins 2014-06-05 13:45:18 -04:00
parent a2294b4b1e
commit 3d2cd163d3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/PhpWord/Shared/ZipArchive.php
View File

@ -224,7 +224,9 @@ class ZipArchive
// To Rename the file while adding it to the zip we // To Rename the file while adding it to the zip we
// need to create a temp file with the correct name // need to create a temp file with the correct name
$temp_file = false;
if ($filenameParts['basename'] != $localnameParts['basename']) { if ($filenameParts['basename'] != $localnameParts['basename']) {
$temp_file = true; // temp file created
$temppath = $this->tempDir . '/' . $localnameParts['basename']; $temppath = $this->tempDir . '/' . $localnameParts['basename'];
copy($filename, $temppath); copy($filename, $temppath);
$filename = $temppath; $filename = $temppath;
@ -236,6 +238,11 @@ class ZipArchive
$res = $zip->add($filename, PCLZIP_OPT_REMOVE_PATH, $pathRemoved, PCLZIP_OPT_ADD_PATH, $pathAdded); $res = $zip->add($filename, PCLZIP_OPT_REMOVE_PATH, $pathRemoved, PCLZIP_OPT_ADD_PATH, $pathAdded);
if($temp_file) {
// Remove temp file, if created
@unlink($this->tempDir . '/' . $localnameParts["basename"]);
}
return ($res == 0) ? false : true; return ($res == 0) ? false : true;
} }