fix: Replace characters invisible by empty

It's a short term fix. I don't know if it's an ideal solution.
arawa · Nov 28, 2024 · c3607bc · c3607bc
1 parent 9a02d60
commit c3607bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/Files/Csv/CsvReader.php b/lib/Files/Csv/CsvReader.php
@@ -12,7 +12,10 @@ class CsvReader {
 
 	public function __construct(private BasicStreamInterface $file) {
 		$handle = $file->open();
-		$this->headers = fgetcsv($handle, 1000, Separator::COMMA);
+		$headers = fgetcsv($handle, 1000, Separator::COMMA);
+		$this->headers = array_map(function($header) {
+			return preg_replace('/[\x00-\x1F\x7F\x{200B}-\x{200D}\x{FEFF}]/u', '', trim($header));
+		}, $headers);
 		$file->close();
 	}
 

diff --git a/lib/Files/Csv/ImportUsers/HeaderExtractor.php b/lib/Files/Csv/ImportUsers/HeaderExtractor.php
@@ -7,6 +7,9 @@
 class HeaderExtractor implements CsvHeaderExtractorInterface {
 	public static function getIndex(array $haystack, array $needles): int|bool {
 		$index = null;
+		$needles = array_map(function($needle) {
+			return preg_replace('/[\x00-\x1F\x7F\x{200B}-\x{200D}\x{FEFF}]/u', '', trim($needle));
+		}, $needles);
 		foreach($haystack as $key => $value) {
 			$index = array_search($value, $needles);
 			if ($index !== false) {