Skip to content

Commit a32861a

Browse files
oleibmanoleibman
authored
Copy from Xls(x) to Html/Pdf Loses Drawings (#2788)
Drawings in an Xlsx file are stored in such a way that Php can read their contents using the `zip:` protocol. This does not, however, work when the file is read by PhpSpreadsheet and then saved as Html or Pdf, since the browser will not recognize that protocol even if the file is available. Such drawings need to be saved in the html as embedded images in order for the copy to display them properly. This is true even when the writer is set to not embed images (default). An additional problem arises when an Html file with an embedded image is read, because `Worksheet\Drawing::setPath` attempts to validate the path, which it cannot do for the `data:image` Url which embedded images use. And yet another problem. Writer/Html writes out a MemoryDrawing as a png using the imagepng function; but then declares it as jpeg in the Html. This is now corrected. And a fourth problem. Writer/Html ignores the last row if it contains nothing but a Memory Drawing, which can be true when copying an Xls file. These changes are testable (it's how I discovered the second part of this parlay). I think it is also useful to add a sample to see the results of this type of copy.
1 parent 9776efc commit a32861a

File tree

5 files changed

+182
-3
lines changed

5 files changed

+182
-3
lines changed

‎samples/Basic/27_Images_Html_Pdf.php‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?php
2+
3+
use PhpOffice\PhpSpreadsheet\IOFactory;
4+
use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
5+
use PhpOffice\PhpSpreadsheet\Shared\File;
6+
use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
7+
use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
8+
use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
9+
10+
require __DIR__ . '/../Header.php';
11+
12+
// Read from Xls (.xls) template
13+
$helper->log('Load Xlsx template file');
14+
$reader = IOFactory::createReader('Xls');
15+
$initialSpreadsheet = $reader->load(__DIR__ . '/../templates/27template.xls');
16+
17+
$xlsxFile = File::temporaryFilename();
18+
$writer = new XlsxWriter($initialSpreadsheet);
19+
$helper->log('Save as Xlsx');
20+
$writer->save($xlsxFile);
21+
$initialSpreadsheet->disconnectWorksheets();
22+
$reader2 = new XlsxReader();
23+
$helper->log('Load Xlsx');
24+
$spreadsheet = $reader2->load($xlsxFile);
25+
26+
$helper->log('Hide grid lines');
27+
$spreadsheet->getActiveSheet()->setShowGridLines(false);
28+
29+
$helper->log('Set orientation to landscape');
30+
$spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
31+
32+
$className = Mpdf::class;
33+
$helper->log("Write to PDF format using {$className}, and to Html");
34+
IOFactory::registerWriter('Pdf', $className);
35+
36+
// Save
37+
$helper->write($spreadsheet, __FILE__, ['Pdf', 'Html']);
38+
unlink($xlsxFile);
39+
$spreadsheet->disconnectWorksheets();

‎src/PhpSpreadsheet/Worksheet/Drawing.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function getPath()
106106
*/
107107
public function setPath($path, $verifyFile = true, $zip = null)
108108
{
109-
if ($verifyFile) {
109+
if ($verifyFile && preg_match('~^data:image/[a-z]+;base64,~', $path) !== 1) {
110110
// Check if a URL has been passed. https://stackoverflow.com/a/2058596/1252979
111111
if (filter_var($path, FILTER_VALIDATE_URL)) {
112112
$this->path = $path;

‎src/PhpSpreadsheet/Writer/Html.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ public function generateSheetData()
485485

486486
$html .= $endTag;
487487
}
488+
--$row;
488489
$html .= $this->extendRowsForChartsAndImages($sheet, $row);
489490

490491
// Write table footer
@@ -675,7 +676,7 @@ private function writeImageInCell(Worksheet $worksheet, $coordinates)
675676
$html .= PHP_EOL;
676677
$imageData = self::winFileToUrl($filename);
677678

678-
if ($this->embedImages && !$this->isPdf) {
679+
if (($this->embedImages && !$this->isPdf) || substr($imageData, 0, 6) === 'zip://') {
679680
$picture = @file_get_contents($filename);
680681
if ($picture !== false) {
681682
$imageDetails = getimagesize($filename);
@@ -699,7 +700,7 @@ private function writeImageInCell(Worksheet $worksheet, $coordinates)
699700
ob_end_clean(); // End the output buffer.
700701

701702
/** @phpstan-ignore-next-line */
702-
$dataUri = 'data:image/jpeg;base64,' . base64_encode($contents);
703+
$dataUri = 'data:image/png;base64,' . base64_encode($contents);
703704

704705
// Because of the nature of tables, width is more important than height.
705706
// max-width: 100% ensures that image doesnt overflow containing cell

‎tests/PhpSpreadsheetTests/Writer/Html/ImageCopyTest.php‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?php
2+
3+
namespace PhpOffice\PhpSpreadsheetTests\Writer\Html;
4+
5+
use PhpOffice\PhpSpreadsheet\Reader\Xls as XlsReader;
6+
use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
7+
use PhpOffice\PhpSpreadsheet\Shared\File;
8+
use PhpOffice\PhpSpreadsheet\Writer\Html;
9+
use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
10+
use PhpOffice\PhpSpreadsheetTests\Functional;
11+
12+
class ImageCopyTest extends Functional\AbstractFunctional
13+
{
14+
/** @var string */
15+
private $xlsxFile = '';
16+
17+
protected function tearDown(): void
18+
{
19+
if ($this->xlsxFile !== '') {
20+
unlink($this->xlsxFile);
21+
$this->xlsxFile = '';
22+
}
23+
}
24+
25+
public function testImageCopyXls(): void
26+
{
27+
$file = 'samples/templates/27template.xls';
28+
$reader = new XlsReader();
29+
$reloadedSpreadsheet = $reader->load($file);
30+
31+
$writer = new Html($reloadedSpreadsheet);
32+
$writer->writeAllSheets();
33+
self::assertFalse($writer->getEmbedImages());
34+
$html = $writer->generateHTMLAll();
35+
self::assertSame(4, substr_count($html, '<img'));
36+
self::assertSame(0, substr_count($html, 'zip://'));
37+
// all 4 images converted to png
38+
self::assertSame(4, substr_count($html, 'data:image/png;base64'));
39+
40+
$this->writeAndReload($reloadedSpreadsheet, 'Html');
41+
$reloadedSpreadsheet->disconnectWorksheets();
42+
}
43+
44+
public function testImageCopyXlsx(): void
45+
{
46+
$file = 'samples/templates/27template.xls';
47+
$reader = new XlsReader();
48+
$spreadsheet = $reader->load($file);
49+
$this->xlsxFile = File::temporaryFilename();
50+
$writer = new XlsxWriter($spreadsheet);
51+
$writer->save($this->xlsxFile);
52+
$spreadsheet->disconnectWorksheets();
53+
$reader2 = new XlsxReader();
54+
$reloadedSpreadsheet = $reader2->load($this->xlsxFile);
55+
56+
$writer = new Html($reloadedSpreadsheet);
57+
$writer->writeAllSheets();
58+
self::assertFalse($writer->getEmbedImages());
59+
$html = $writer->generateHTMLAll();
60+
self::assertSame(4, substr_count($html, '<img'));
61+
self::assertSame(0, substr_count($html, 'zip://'));
62+
// "gif" is actually stored as png in this file
63+
self::assertSame(2, substr_count($html, 'data:image/png;base64'));
64+
//self::assertSame(1, substr_count($html, 'data:image/gif;base64'));
65+
self::assertSame(2, substr_count($html, 'data:image/jpeg;base64'));
66+
67+
$this->writeAndReload($reloadedSpreadsheet, 'Html');
68+
$reloadedSpreadsheet->disconnectWorksheets();
69+
}
70+
}

‎tests/PhpSpreadsheetTests/Writer/Mpdf/ImageCopyPdfTest.php‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?php
2+
3+
namespace PhpOffice\PhpSpreadsheetTests\Writer\Html;
4+
5+
use PhpOffice\PhpSpreadsheet\Reader\Xls as XlsReader;
6+
use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
7+
use PhpOffice\PhpSpreadsheet\Shared\File;
8+
use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
9+
use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
10+
use PhpOffice\PhpSpreadsheetTests\Functional;
11+
12+
class ImageCopyPdfTest extends Functional\AbstractFunctional
13+
{
14+
/** @var string */
15+
private $xlsxFile = '';
16+
17+
protected function tearDown(): void
18+
{
19+
if ($this->xlsxFile !== '') {
20+
unlink($this->xlsxFile);
21+
$this->xlsxFile = '';
22+
}
23+
}
24+
25+
public function testImageCopyXls(): void
26+
{
27+
$file = 'samples/templates/27template.xls';
28+
$reader = new XlsReader();
29+
$reloadedSpreadsheet = $reader->load($file);
30+
$this->xlsxFile = File::temporaryFilename();
31+
32+
$writer = new Mpdf($reloadedSpreadsheet);
33+
self::assertFalse($writer->getEmbedImages());
34+
$html = $writer->generateHTMLAll();
35+
self::assertSame(4, substr_count($html, '<img'));
36+
self::assertSame(0, substr_count($html, 'zip://'));
37+
// all 4 images converted to png
38+
self::assertSame(4, substr_count($html, 'data:image/png;base64'));
39+
40+
$this->writeAndReload($reloadedSpreadsheet, 'Html');
41+
$reloadedSpreadsheet->disconnectWorksheets();
42+
}
43+
44+
public function testImageCopyXlsx(): void
45+
{
46+
$file = 'samples/templates/27template.xls';
47+
$reader = new XlsReader();
48+
$spreadsheet = $reader->load($file);
49+
$this->xlsxFile = File::temporaryFilename();
50+
$writer = new XlsxWriter($spreadsheet);
51+
$writer->save($this->xlsxFile);
52+
$spreadsheet->disconnectWorksheets();
53+
$reader2 = new XlsxReader();
54+
$reloadedSpreadsheet = $reader2->load($this->xlsxFile);
55+
56+
$writer = new Mpdf($reloadedSpreadsheet);
57+
self::assertFalse($writer->getEmbedImages());
58+
$html = $writer->generateHTMLAll();
59+
self::assertSame(4, substr_count($html, '<img'));
60+
self::assertSame(0, substr_count($html, 'zip://'));
61+
// "gif" is actually stored as png in this file
62+
self::assertSame(2, substr_count($html, 'data:image/png;base64'));
63+
//self::assertSame(1, substr_count($html, 'data:image/gif;base64'));
64+
self::assertSame(2, substr_count($html, 'data:image/jpeg;base64'));
65+
66+
$this->writeAndReload($reloadedSpreadsheet, 'Html');
67+
$reloadedSpreadsheet->disconnectWorksheets();
68+
}
69+
}

0 commit comments

Comments
 (0)