From 5c75e470fed84331b19f16b56cdc02e3be47888d Mon Sep 17 00:00:00 2001
From: Torsten Schulz <tsschulz@gmx.net>
Date: Wed, 27 Dec 2023 11:31:41 +0100
Subject: [PATCH] Fixed headers and output

---
 include/memberlistdownload.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/memberlistdownload.php b/include/memberlistdownload.php
index fb75205..683e26a 100644
--- a/include/memberlistdownload.php
+++ b/include/memberlistdownload.php
@@ -10,9 +10,12 @@ class Memberlistdownload extends Renderer {
         $members = $this->loadMembers();
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
-        $columnHeaders = [];
+        $columnHeaders = ['Nachname', 'Vorname', 'Straße', 'Plz', 'Ort', 'Geburtsdatum', 'Telefon', 
+                          'Mitgliedsbeitrag', 'Bank', 'IBAN', 'BIC', 'Kontoinhaber', 'Status der Mitgliedschaft', 
+                          'Start der Mitgliedschaft', 'Letzte Zahlung', 'Position'
+                         ];
         $sheet->fromArray([$columnHeaders], null, 'A1');
-        $sheet->fromArray($dataArray, null, 'A2');
+        $sheet->fromArray($members, null, 'A2');
         $writer = new Xlsx($spreadsheet);
         header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
         header('Content-Disposition: attachment;filename="excel_file.xlsx"');
@@ -36,7 +39,6 @@ queryend;
 	$result = mysqli_query($this->dbConnection, $query);
 	$entries = [];
 	while ($row = mysqli_fetch_assoc($result)) {
-		var_dump($row);
             $entries[] = [
                 'first_name' => $this->decode($row['first_name'], $row['salt']),
                 'last_name' => $this->decode($row['last_name'], $row['salt']),
@@ -53,11 +55,10 @@ queryend;
                 'bank_name' => $this->decode($row['bank_name'], $row['salt']),
                 'bic' => $this->decode($row['bic'], $row['salt']),
                 'account_member_name' => $this->decode($row['account_member_name'], $row['salt']),
-                'membership_status' => $row['membership_status'],
-                'membership_start' => $row['membership_start'],
                 'status_text' => $row['status_text'],
+                'membership_start' => $row['membership_start'],
                 'last_payment' => $row['last_payment'],
-		'description' => $row['description'],
+                'description' => $row['description'],
             ];
         }
         return $entries;