Skip to content

fix(report_vendor_model): avoid blank page with All/All by sanitizing… #1629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alex001x wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(report_vendor_model): avoid blank page with All/All by sanitizing… #1629

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7a70c3
fix(report_vendor_model): avoid blank page with All/All by sanitizing…
alex001x Nov 6, 2025
21a0e84
Merge branch 'opendcim:master' into fix/report_vendor_model_all_blank
alex001x Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions report_vendor_model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,32 @@
$columnList[$labelName] = $colName;
}

$usedSheetTitles = array();

foreach( $manList as $mfg ) {
$dt = new DeviceTemplate();
$dt->ManufacturerID = $mfg->ManufacturerID;
$templateList = $dt->Search();

if ( sizeof($templateList) > 0 ) {
$sheet = $workBook->createSheet(null);
$sheet->setTitle( $mfg->Name );
// Sanitize worksheet title; enforce uniqueness and Excel limits
if (class_exists('\\PhpOffice\\PhpSpreadsheet\\Worksheet\\Worksheet') && method_exists('\\PhpOffice\\PhpSpreadsheet\\Worksheet\\Worksheet','sanitizeSheetTitle')) {
$safeTitle = \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::sanitizeSheetTitle($mfg->Name);
} else {
$safeTitle = preg_replace('/[:\\\\\/?*\[\]]/',' ', (string)$mfg->Name);
}
$safeTitle = mb_substr($safeTitle, 0, 31);
$safeTitle = (trim($safeTitle) !== '') ? $safeTitle : __('Manufacturer');
$baseTitle = $safeTitle;
$dup = 1;
while (in_array($safeTitle, $usedSheetTitles)) {
$suffix = ' ('.($dup++).')';
$cut = 31 - strlen($suffix);
$safeTitle = mb_substr($baseTitle, 0, max(0,$cut)) . $suffix;
}
$usedSheetTitles[] = $safeTitle;
$sheet->setTitle( $safeTitle );

foreach( $columnList as $fieldName=>$columnName ) {
$cellAddr = $columnName."1";
Expand Down Expand Up @@ -257,7 +275,7 @@
// Nothing got added, so delete this sheet
$workBook->removeSheetByIndex(
$workBook->getIndex(
$workBook->getSheetByName($mfg->Name)));
$workBook->getSheetByName($safeTitle)));
}
}
}
Expand Down