From d2920431d5453328898a9d9601efccb63d52d887 Mon Sep 17 00:00:00 2001
From: Dalpil <47555+dalpil@users.noreply.github.com>
Date: Thu, 14 Dec 2023 20:30:21 +0100
Subject: [PATCH] Bugfix: Always use UTF-8 as input encoding
---
app/admin/import-export/export-ipaddr.php | 1 +
app/admin/import-export/export-subnets.php | 1 +
app/admin/import-export/export-vlan.php | 1 +
app/admin/import-export/import-template.php | 1 +
4 files changed, 4 insertions(+)
diff --git a/app/admin/import-export/export-ipaddr.php b/app/admin/import-export/export-ipaddr.php
index fccef110..0e6bdc1a 100644
--- a/app/admin/import-export/export-ipaddr.php
+++ b/app/admin/import-export/export-ipaddr.php
@@ -287,6 +287,7 @@ $curRow++;
if( (isset($_GET['exportSections'])) && ($_GET['exportSections'] == "on") ) {
// Create a worksheet
$worksheet_sections =& $workbook->addWorksheet('Sections');
+ $worksheet_sections->setInputEncoding("utf-8");
$curRow = 0;
$curColumn = 0;
diff --git a/app/admin/import-export/export-subnets.php b/app/admin/import-export/export-subnets.php
index d381a075..781f1e5e 100644
--- a/app/admin/import-export/export-subnets.php
+++ b/app/admin/import-export/export-subnets.php
@@ -252,6 +252,7 @@ $curRow++;
if( (isset($_GET['exportSections'])) && ($_GET['exportSections'] == "on") ) {
// Create a worksheet
$worksheet_sections =& $workbook->addWorksheet('Sections');
+ $worksheet_sections->setInputEncoding("utf-8");
$curRow = 0;
$curColumn = 0;
diff --git a/app/admin/import-export/export-vlan.php b/app/admin/import-export/export-vlan.php
index b1f56a6b..802badba 100644
--- a/app/admin/import-export/export-vlan.php
+++ b/app/admin/import-export/export-vlan.php
@@ -157,6 +157,7 @@ if(
) {
// Create a worksheet
$worksheet_domains =& $workbook->addWorksheet('Domains');
+ $worksheet_domains->setInputEncoding("utf-8");
$curRow = 0;
$curColumn = 0;
diff --git a/app/admin/import-export/import-template.php b/app/admin/import-export/import-template.php
index 1c81bf83..83ea8c6e 100644
--- a/app/admin/import-export/import-template.php
+++ b/app/admin/import-export/import-template.php
@@ -22,6 +22,7 @@ $lineCount = 0;
// Create a worksheet
$worksheet = $workbook->addWorksheet("template");
+$worksheet->setInputEncoding("utf-8");
if ($type == 'subnets'){
--
GitLab