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

changes

Browse Source
This commit is contained in:
Nathan Coad
2014-12-01 22:55:36 +11:00
parent 7a0220aa86
commit 57a7704e62
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
booking.admin.inc
View File

@@ -108,10 +108,29 @@ function booking_admin() {
'#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),
); );
$form['misc'] = array ( $form['misc'] = array (
'#type' => 'fieldset', '#type' => 'fieldset',
'#title' => 'Configuration Options', '#title' => 'Configuration Options',
); );
$form['misc']['booking_default_country'] = array (
'#type' => 'select',
'#title' => t('Select Default Country'),
'#description' => t('Select default country for residential address.'),
'#options' => _booking_country_options(),
'#default_value' => variable_get('booking_default_country', 'Australia'),
);
$form['misc']['booking_local_timezone'] = array (
'#type' => 'select',
'#title' => t('Select Local Time Zone'),
'#description' => t('Select time zone to use when calculating dates and times. This should match drupal\'s timezone definition'),
'#options' => _booking_country_options(),
'#default_value' => variable_get('booking_default_country', 'Australia'),
);
$form['misc']['booking_default_gender'] = array ( $form['misc']['booking_default_gender'] = array (
'#type' => 'select', '#type' => 'select',
'#title' => t('Select Default Gender'), '#title' => t('Select Default Gender'),
@@ -126,13 +145,6 @@ function booking_admin() {
'#options' => array (0 => t('No'), t('Yes')), '#options' => array (0 => t('No'), t('Yes')),
'#default_value' => variable_get('booking_allow_couples', 0), '#default_value' => variable_get('booking_allow_couples', 0),
); );
$form['misc']['booking_default_country'] = array (
'#type' => 'select',
'#title' => t('Select Default Country'),
'#description' => t('Select default country for residential address.'),
'#options' => _booking_country_options(),
'#default_value' => variable_get('booking_default_country', 'Australia'),
);
$form['misc']['booking_auto_confirm_email'] = array ( $form['misc']['booking_auto_confirm_email'] = array (
'#type' => 'radios', '#type' => 'radios',

2
booking.paypal.inc
View File

@@ -32,7 +32,7 @@ function _booking_paypal_ipn_verify($vars = array()) {
curl_close($ch); curl_close($ch);
ob_end_clean(); ob_end_clean();
if (preg_match('/VERIFIED/i', $info)) { if (('/VERIFIED/i', $info)) {
watchdog('booking', 'Payment verification completed successfully: @info', array('@info' => $info)); watchdog('booking', 'Payment verification completed successfully: @info', array('@info' => $info));
return TRUE; return TRUE;
} }

6
booking.reports.inc
View File

@@ -707,8 +707,7 @@ function booking_csv_report() {
$output[] = _booking_status_generate($value); $output[] = _booking_status_generate($value);
continue; continue;
} }
ygroup session roles
//studygroup session roles
if (preg_match("/session\d+_role/", $key)) if (preg_match("/session\d+_role/", $key))
{ {
$output[] = _booking_studygroup_role_lookup($value); $output[] = _booking_studygroup_role_lookup($value);
@@ -743,8 +742,7 @@ function booking_csv_report() {
continue; continue;
} }
// Enclose fields containing $delimiter, $enclosure or whitespace // Enclose fields containing $delimiter, $enclosure or wh if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $value ) ) {
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 {