Cleaned up code indentation

This commit is contained in:
lars 2019-05-02 14:55:16 +02:00
parent 7177e5f096
commit bcd321b9d0

View File

@ -52,9 +52,10 @@ $mysqli = new mysqli($cfg['host'], $cfg['user'],$cfg['pass'], $cfg['name']);
if ($mysqli->connect_errno) { if ($mysqli->connect_errno) {
echo "Failed to connect to MySQL: (" . $mysqli->connect_errno . ") " . $mysqli->connect_error; echo "Failed to connect to MySQL: (" . $mysqli->connect_errno . ") " . $mysqli->connect_error;
} }
if ($result = $mysqli->query($query)) { if ($result = $mysqli->query($query)) {
$line = 1; $line = 1;
// First merge keys of all serialized values so we are sure to have all columns // First merge keys of all serialized values and build an array containing all columns
// (even if they are empty on first line... -> no key)
while ($row = $result->fetch_assoc()) { while ($row = $result->fetch_assoc()) {
$ser = $row['formdata']; $ser = $row['formdata'];
$seru = unserialize($ser); $seru = unserialize($ser);
@ -72,9 +73,10 @@ if ($mysqli->connect_errno) {
} }
} }
} }
if ($result = $mysqli->query($query)) {
$line = 1; // Now we have a array with all the keys/columns we want to export to Excel
if ($result = $mysqli->query($query)) {
$line = 1;
/* fetch associative array */ /* fetch associative array */
while ($row = $result->fetch_assoc()) { while ($row = $result->fetch_assoc()) {
$ser = $row['formdata']; $ser = $row['formdata'];
@ -114,7 +116,7 @@ $line = 1;
$line++; $line++;
} }
$spreadsheet->getActiveSheet() $spreadsheet->getActiveSheet()
->fromArray( ->fromArray(
$fr, // The data to set $fr, // The data to set
NULL, // Array values with this value will not be set NULL, // Array values with this value will not be set
@ -123,10 +125,8 @@ $spreadsheet->getActiveSheet()
); );
$line++; $line++;
} }
} }
$spreadsheet->getActiveSheet()->getStyle('1')->getFont()->setBold(true); $spreadsheet->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
$spreadsheet->getActiveSheet()->setTitle('Toutes demandes'); $spreadsheet->getActiveSheet()->setTitle('Toutes demandes');
foreach (range('A','Z') as $col) { foreach (range('A','Z') as $col) {
@ -153,10 +153,10 @@ $spreadsheet->getActiveSheet()->getStyle($coord.':AA'.($highestRow+2))->getFill(
// ------ // ------
// Go again this time sorted by name so we can create a worksheet per requestor // Go again this time sorted by name so we can create a worksheet per requestor
$query = "SELECT * from submissions ORDER BY name"; $query = "SELECT * from submissions ORDER BY name";
if ($result = $mysqli->query($query)) { if ($result = $mysqli->query($query)) {
$line = 1; $line = 1;
/* fetch associative array */ /* fetch associative array */
while ($row = $result->fetch_assoc()) { while ($row = $result->fetch_assoc()) {
$ser = $row['formdata']; $ser = $row['formdata'];