From 62ae5d89a49ae48ea8217fcb371ae2cc6f6471b1 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Thu, 12 Jul 2018 08:03:37 +1000
Subject: [PATCH] escape column headings in CSV output

---
 booking.variety_admin.inc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/booking.variety_admin.inc b/booking.variety_admin.inc
index 87afb91..254698a 100644
--- a/booking.variety_admin.inc
+++ b/booking.variety_admin.inc
@@ -588,7 +588,15 @@ function booking_varietysessions_csv_report($timeslot_id) {
   foreach ($header_array as $column) {
     $maximums[] = count($data[$column]);
     //make the column headings a bit more user friendly
-    $column_headings[] = $variety_sessions[$column]->booking_variety_descrip;
+    $heading = $variety_sessions[$column]->booking_variety_descrip;
+    //enclose $heading if necessary
+    if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $heading ) ) {
+      $column_headings[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $heading) . $enclosure;
+    }
+    else {
+      $column_headings[] = $heading;
+    }    
+    //$column_headings[] = $variety_sessions[$column]->booking_variety_descrip;
   }
   
   //add the column headings to the CSV