diff --git a/booking.variety_form.inc b/booking.variety_form.inc index 3ec4256..7db747b 100644 --- a/booking.variety_form.inc +++ b/booking.variety_form.inc @@ -18,8 +18,7 @@ function booking_variety_regn_form($node, &$form_state) $form['booking_variety_regn_feedback_wrapper'] = array( - '#markup' => '
Please enter your booking number from your lanyard. ' . - '


', + '#markup' => '
Please enter your booking number from your lanyard.
', ); $form['booking_nid'] = array( '#type' => 'textfield', @@ -42,20 +41,6 @@ function booking_variety_regn_form($node, &$form_state) $result = $timeslot_query->execute(); foreach($result as $timeslot) { - //reset the array - $options = array (); - $options[''] = ''; - - //query for variety sessions in the timeslot - $session_query = db_query("SELECT * from {booking_variety_options} WHERE booking_variety_timeslot_id = :id AND booking_variety_status = 1", - array(':id' => $timeslot->tid)); - - //add all the sessions to the select list - foreach($session_query as $session) - { - $options[$session->vid] = $session->booking_variety_descrip; - } - //create the form element for this timeslot $form['select-variety-' . $timeslot->tid] = array( '#type' => 'select', @@ -111,8 +96,8 @@ function booking_variety_regn_callback($form, &$form_state) { //verify that user-entered data is a number if (! preg_match('/^[0-9]+$/', $data['booking_nid'])) { watchdog('booking_debug', "
booking_variety_regn_callback non-numerical input
"); - return '
' . - 'You have not entered a valid booking reference number.

'; + return '
' . + 'You have not entered a valid booking reference number.
'; } // Perform lookup on barcode to make sure it matches someone attending the current event @@ -129,12 +114,12 @@ function booking_variety_regn_callback($form, &$form_state) { if ($person) { watchdog('booking_debug', "
booking_variety_regn_callback  found valid attendee
"); - return '
' . - 'Matched booking reference number.

'; + return '
' . + 'Matched booking reference number.
'; } else { watchdog('booking_debug', "
booking_variety_regn_callback did not find valid attendee
"); - return '
' . - 'You have not entered a valid booking reference number.

'; + return '
' . + 'You have not entered a valid booking reference number.
'; } } \ No newline at end of file