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

tweak enclosure setting

Browse Source
This commit is contained in:
Nathan Coad
2018-07-13 14:18:17 +10:00
parent 90f0488448
commit 12cc3d33c9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
booking.variety_admin.inc
View File

@@ -545,7 +545,7 @@ function booking_varietysessions_csv_report($timeslot_id) {
$csv = ''; $csv = '';
$delimiter = ','; $delimiter = ',';
$enclosure = '"'; $enclosure = '"';
$encloseAll = true; $encloseAll = false;
$nullToMysqlNull = true; $nullToMysqlNull = true;
$delimiter_esc = preg_quote($delimiter, '/'); $delimiter_esc = preg_quote($delimiter, '/');
$enclosure_esc = preg_quote($enclosure, '/'); $enclosure_esc = preg_quote($enclosure, '/');
@@ -611,7 +611,7 @@ function booking_varietysessions_csv_report($timeslot_id) {
for ($i = 0; $i < max($maximums); $i++) { for ($i = 0; $i < max($maximums); $i++) {
$output = array(); $output = array();
foreach ($header_array as $column) { foreach ($header_array as $column) {
$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 ) ) {
@@ -902,7 +902,7 @@ function booking_variety_regn_edit_form_submit($form, &$form_state) {
watchdog('booking', "Updated variety session registration for person ID !nid", array('!nid' => $values['nid'])); watchdog('booking', "Updated variety session registration for person ID !nid", array('!nid' => $values['nid']));
} }
// Finished, redirect to original table
$form_state['redirect'] = $redirect_path; $form_state['redirect'] = $redirect_path;
} }
} }