mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-16 21:58:17 +01:00
Code Issues Projects Releases Wiki Activity

CSV export improvements (#7253)

Browse Source 
* CSV export improvements

* CSV export improvements

* CSV export improvements

* Autocommit PHP CS Fixer

* CSV/XLSX export improvements

* CSV/XLSX export improvements

* Autocommit PHP CS Fixer

---------

Co-authored-by: gevorgmansuryan <gevorgmansuryan@users.noreply.github.com>
Co-authored-by: Lucas Bartholemy <luke-@users.noreply.github.com>
This commit is contained in:
Gevorg Mansuryan 2024-10-15 12:44:34 +04:00 committed by GitHub
parent d52a58fcd6
commit 8e2b206bc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -47,6 +47,7 @@ HumHub Changelog
- Fix #7248: Upgrade jQuery Highlight plugin
- Fix #7254: Fix Login view HTML element ID from `user-auth-login-modal` to `user-auth-login`
- Fix #7250: Check writable path
- Enh #7253: CSV/XLSX export improvements
1.16.3 (Unreleased)
--------------------------

39
protected/humhub/components/export/SpreadsheetExport.php
View File

@ -7,6 +7,7 @@
namespace humhub\components\export;
use PhpOffice\PhpSpreadsheet\IOFactory;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use Yii;
use yii\base\Component;
@ -14,6 +15,7 @@ use yii\base\InvalidConfigException;
use yii\data\ActiveDataProvider;
use yii\data\BaseDataProvider;
use yii\di\Instance;
use yii\helpers\ArrayHelper;
use yii\i18n\Formatter;
/**
@ -276,10 +278,10 @@ class SpreadsheetExport extends Component
}
/**
* Composes header row contents.
* @param Spreadsheet $spreadsheet
* @throws \PhpOffice\PhpSpreadsheet\Exception
*/
* Composes header row contents.
* @param Spreadsheet $spreadsheet
* @throws \PhpOffice\PhpSpreadsheet\Exception
*/
protected function composeHeaderRow($spreadsheet)
{
$worksheet = $spreadsheet->getActiveSheet();
@ -346,6 +348,7 @@ class SpreadsheetExport extends Component
foreach ($this->columns as $columnIndex => $column) {
$coordinate = $this->getColumnLetter($columnIndex + 1) . $row;
$value = $column->renderDataCellContent($model, $key, $index);
$value = $this->sanitizeValue($value);
if ($column->dataType !== null) {
$worksheet->getCell($coordinate)->setValueExplicit($value, $column->dataType);
@ -359,6 +362,34 @@ class SpreadsheetExport extends Component
}
}
/**
* Sanitize value to prevent injection.
*/
private function sanitizeValue(?string $value): ?string
{
if (
empty($value) ||
!in_array(
ucfirst(ArrayHelper::getValue($this->resultConfig, 'writerType', (new ExportResult())->writerType)),
[IOFactory::WRITER_CSV, IOFactory::WRITER_XLSX, IOFactory::WRITER_XLS],
)
) {
return $value;
}
// Check for risky starting characters or formula-like values and prepend single quote
if (strpbrk($value[0], '=+-@,;' . "\t" . "\r") !== false || preg_match('/^\d+[+\-*\/].+/', $value)) {
$value = "'" . $value;
}
// Sanitize escaping quotes, wrapping in double quotes if needed
if (strpbrk($value, "\"\n,") !== false) {
$value = '"' . str_replace('"', '""', $value) . '"';
}
return $value;
}
/**
* Enable AutoSize for Export
* @param Spreadsheet $spreadsheet