Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2025-02-04 18:20:26 +01:00
commit a4462cdb6a

View File

@ -129,6 +129,7 @@ class SeedDMS_Download_Mgr {
public function createToc($file) { /* {{{ */ public function createToc($file) { /* {{{ */
$objPHPExcel = new PhpOffice\PhpSpreadsheet\Spreadsheet(); $objPHPExcel = new PhpOffice\PhpSpreadsheet\Spreadsheet();
//$objPHPExcel->setValueBinder(new \PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder());
$objPHPExcel->getProperties()->setCreator("SeedDMS")->setTitle("Metadata"); $objPHPExcel->getProperties()->setCreator("SeedDMS")->setTitle("Metadata");
if($items = $this->items) { if($items = $this->items) {
$sheet = $objPHPExcel->setActiveSheetIndex(0); $sheet = $objPHPExcel->setActiveSheetIndex(0);
@ -234,31 +235,31 @@ class SeedDMS_Download_Mgr {
$sheet = $objPHPExcel->createSheet($i); $sheet = $objPHPExcel->createSheet($i);
else else
$sheet = $objPHPExcel->setActiveSheetIndex(0); $sheet = $objPHPExcel->setActiveSheetIndex(0);
$sheet->setTitle(getMLText('folders')); $sheet->setTitle(getMLText('folders'));
$i = 1;
$col = 1;
foreach($this->folder_header as $h)
$sheet->setCellValueByColumnAndRow($col++, $i, $h);
foreach($this->folder_extraheader as $h)
$sheet->setCellValueByColumnAndRow($col++, $i, $h);
$i++;
$items = $this->folder_items;
foreach($items as $item) {
if($item->isType('folder')) {
$folder = $item;
$dms = $folder->_dms;
$i = 1;
$col = 1; $col = 1;
$sheet->setCellValueByColumnAndRow($col++, $i, $folder->getID()); foreach($this->folder_header as $h)
$sheet->setCellValueByColumnAndRow($col++, $i, $folder->getName()); $sheet->setCellValueByColumnAndRow($col++, $i, $h);
if(isset($this->folder_extracols[$item->getID()]) && $this->folder_extracols[$item->getID()]) { foreach($this->folder_extraheader as $h)
foreach($this->folder_extracols[$item->getID()] as $column) $sheet->setCellValueByColumnAndRow($col++, $i, $h);
$sheet->setCellValueByColumnAndRow($col++, $i, is_array($column) ? implode("\n", $column) : $column );
}
$i++; $i++;
} $items = $this->folder_items;
} foreach($items as $item) {
if($item->isType('folder')) {
$folder = $item;
$dms = $folder->_dms;
$col = 1;
$sheet->setCellValueByColumnAndRow($col++, $i, $folder->getID());
$sheet->setCellValueByColumnAndRow($col++, $i, $folder->getName());
if(isset($this->folder_extracols[$item->getID()]) && $this->folder_extracols[$item->getID()]) {
foreach($this->folder_extracols[$item->getID()] as $column)
$sheet->setCellValueByColumnAndRow($col++, $i, is_array($column) ? implode("\n", $column) : $column );
}
$i++;
}
}
} }
$objWriter = new PhpOffice\PhpSpreadsheet\Writer\Xlsx($objPHPExcel); $objWriter = new PhpOffice\PhpSpreadsheet\Writer\Xlsx($objPHPExcel);