diff --git a/booking.admin.inc b/booking.admin.inc index 9ef9e80..c926e42 100644 --- a/booking.admin.inc +++ b/booking.admin.inc @@ -108,10 +108,29 @@ function booking_admin() { '#options' => array (0 => t('Off'), t('On')), '#default_value' => variable_get('booking_paypal_sandbox', 0), ); + $form['misc'] = array ( '#type' => 'fieldset', '#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 ( '#type' => 'select', '#title' => t('Select Default Gender'), @@ -126,13 +145,6 @@ function booking_admin() { '#options' => array (0 => t('No'), t('Yes')), '#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 ( '#type' => 'radios', diff --git a/booking.paypal.inc b/booking.paypal.inc index 8793df3..e7cdaac 100644 --- a/booking.paypal.inc +++ b/booking.paypal.inc @@ -32,7 +32,7 @@ function _booking_paypal_ipn_verify($vars = array()) { curl_close($ch); ob_end_clean(); - if (preg_match('/VERIFIED/i', $info)) { + if (('/VERIFIED/i', $info)) { watchdog('booking', 'Payment verification completed successfully: @info', array('@info' => $info)); return TRUE; } diff --git a/booking.reports.inc b/booking.reports.inc index 2f02cc7..9b83f0e 100644 --- a/booking.reports.inc +++ b/booking.reports.inc @@ -707,8 +707,7 @@ function booking_csv_report() { $output[] = _booking_status_generate($value); continue; } - - //studygroup session roles + ygroup session roles if (preg_match("/session\d+_role/", $key)) { $output[] = _booking_studygroup_role_lookup($value); @@ -743,8 +742,7 @@ function booking_csv_report() { continue; } - // Enclose fields containing $delimiter, $enclosure or whitespace - if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $value ) ) { + // Enclose fields containing $delimiter, $enclosure or wh if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $value ) ) { $output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $value) . $enclosure; } else {