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

bugfixes

Browse Source
This commit is contained in:
Nathan Coad
2015-03-08 21:09:43 +11:00
parent 43d4954d9b
commit 95ca0f8982
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
booking.admin.inc
View File

@@ -104,14 +104,14 @@ function booking_admin() {
); );
$form['paypal']['booking_paypal_account'] = array ( $form['paypal']['booking_paypal_account'] = array (
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Account'), '#title' => t('Specify Paypal Account Address'),
'#default_value' => variable_get('booking_paypal_account', ''), '#default_value' => variable_get('booking_paypal_account', ''),
'#description' => '(email address)', '#description' => '(email address)',
); );
$form['paypal']['booking_paypal_sandbox'] = array ( $form['paypal']['booking_paypal_sandbox'] = array (
'#type' => 'radios', '#type' => 'radios',
'#title' => t('Sandbox/Development mode'), '#title' => t('Sandbox/Development mode'),
'#description' => t('When in development mode, the payment gateway will point at sandbox.paypal.com for testing purposes.'), '#description' => t('When in development mode, the payment gateway will point at sandbox.paypal.com for testing purposes. Leave this as off unless doing testing.'),
'#options' => array (0 => t('Off'), t('On')), '#options' => array (0 => t('Off'), t('On')),
'#default_value' => variable_get('booking_paypal_sandbox', 0), '#default_value' => variable_get('booking_paypal_sandbox', 0),
); );

3
booking.reports.inc
View File

@@ -743,7 +743,8 @@ function booking_csv_report() {
continue; continue;
} }
// Enclose fields containing $delimiter, $enclosure or wh if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $value ) ) { // Enclose fields containing $delimiter, $enclosure or whitespace
if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $value ) ) {
$output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $value) . $enclosure; $output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $value) . $enclosure;
} }
else { else {