drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

no need to add quote marks for excel output

Browse Source
This commit is contained in:
Nathan Coad
2018-07-13 14:37:21 +10:00
parent 2f83967ba7
commit 42a91a9d7f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
booking.variety_admin.inc
View File

@@ -592,9 +592,9 @@ function booking_varietysessions_csv_report($timeslot_id) {
//make the column headings a bit more user friendly //make the column headings a bit more user friendly
$heading = $variety_sessions[$column]->booking_variety_descrip; $heading = $variety_sessions[$column]->booking_variety_descrip;
//enclose $heading if necessary //enclose $heading if necessary
if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $heading ) ) { //if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $heading ) ) {
$heading = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $heading) . $enclosure; // $heading = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $heading) . $enclosure;
} //}
// Adjusted for excel, assume each column is just a string // Adjusted for excel, assume each column is just a string
//$column_headings[] = array($heading => 'string'); //$column_headings[] = array($heading => 'string');
@@ -612,12 +612,12 @@ function booking_varietysessions_csv_report($timeslot_id) {
$field = isset($data[$column][$i]) ? $data[$column][$i] : ''; $field = isset($data[$column][$i]) ? $data[$column][$i] : '';
//enclose $field if necessary //enclose $field if necessary
if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field ) ) { //if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field ) ) {
$output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure; // $output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure;
} //}
else { //else {
$output[] = $field; $output[] = $field;
} //}
} //loop through columns } //loop through columns
$rows[] = $output; $rows[] = $output;
//$row = implode($delimiter, $output) . "\n"; //$row = implode($delimiter, $output) . "\n";