joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

Resolved gh-444 by adding the new phpspreadsheet library, and removing the old PHPExcel library.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2020-04-19 02:48:23 +02:00
parent c006572674
commit ddd940e968
958 changed files with 113578 additions and 221271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
admin/helpers/compiler/b_Structure.php
View File

@ -2105,8 +2105,7 @@ class Structure extends Get
))
{
$codeName = $this->componentCodeName;
// TODO needs more looking at this must be dynamic actualy
$this->notNew[] = 'PHPExcel.php';
// TODO needs more looking at this must be dynamic actually
$this->notNew[] = 'LICENSE.txt';
// do license check
$LICENSE = false;
@ -2893,9 +2892,9 @@ class Structure extends Get
'path' => 'admin/views/import',
'rename' => 1);
$this->componentData->folders[] = $importView;
// move the PHPExel Folder
$PHPExcel = array('folder' => 'PHPExcel',
'path' => 'admin/helpers',
// move the phpspreadsheet Folder (TODO we must move this to a library package)
$PHPExcel = array('folderpath' => 'JPATH_LIBRARIES/phpspreadsheet/vendor',
'path' => '/libraries/phpspreadsheet/',
'rename' => 0);
$this->componentData->folders[] = $PHPExcel;
}
@ -3041,17 +3040,8 @@ class Structure extends Get
&& ComponentbuilderHelper::checkArray(
$this->componentData->files
))
|| $this->addEximport
|| $this->googlechart)
{
if ($this->addEximport)
{
// move the PHPExel main file
$PHPExcel = array('file' => 'PHPExcel.php',
'path' => 'admin/helpers',
'rename' => 0);
$this->componentData->files[] = $PHPExcel;
}
if ($this->googlechart)
{
// move the google chart files