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

validation improvements

Browse Source
This commit is contained in:
Nathan Coad
2016-06-11 15:23:16 +10:00
parent 9c263eae95
commit 33c040453a
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
booking.regn_form.inc
View File

@@ -571,7 +571,7 @@ function booking_form($node, &$form_state, $inserting = FALSE)
} }
$form['emergency']['booking_guardian_name'] = array( $form['emergency']['booking_guardian_name'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Parent/Guardian Name'), '#title' => t('Emergency Contact Name'),
'#maxlength' => 100, '#maxlength' => 100,
'#required' => TRUE, '#required' => TRUE,
'#default_value' => empty($data->booking_guardian_name) ? '' : $data->booking_guardian_name '#default_value' => empty($data->booking_guardian_name) ? '' : $data->booking_guardian_name
@@ -585,7 +585,7 @@ function booking_form($node, &$form_state, $inserting = FALSE)
); );
$form['emergency']['booking_guardian_email'] = array( $form['emergency']['booking_guardian_email'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Contact Email Address'), '#title' => t('Emergency Contact Email Address'),
'#size' => 30, '#size' => 30,
'#required' => TRUE, '#required' => TRUE,
'#default_value' => empty($data->booking_guardian_email) ? '' : $data->booking_guardian_email, '#default_value' => empty($data->booking_guardian_email) ? '' : $data->booking_guardian_email,
@@ -595,7 +595,7 @@ function booking_form($node, &$form_state, $inserting = FALSE)
if ($inserting == TRUE) { if ($inserting == TRUE) {
$form['emergency']['booking_guardian_email_confirm'] = array( $form['emergency']['booking_guardian_email_confirm'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Confirm Contact Email Address'), '#title' => t('Confirm Emergency Contact Email Address'),
'#size' => 30, '#size' => 30,
'#required' => TRUE, '#required' => TRUE,
'#default_value' => empty($data->booking_guardian_email_confirm) ? '' : $data->booking_guardian_email_confirm, '#default_value' => empty($data->booking_guardian_email_confirm) ? '' : $data->booking_guardian_email_confirm,
@@ -604,7 +604,7 @@ function booking_form($node, &$form_state, $inserting = FALSE)
$form['emergency']['booking_guardian_phone'] = array( $form['emergency']['booking_guardian_phone'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Mobile Phone Contact Number'), '#title' => t('Emergency Contact Mobile Phone Number'),
'#maxlength' => 30, '#maxlength' => 30,
'#size' => 30, '#size' => 30,
'#required' => TRUE, '#required' => TRUE,
@@ -612,7 +612,7 @@ function booking_form($node, &$form_state, $inserting = FALSE)
); );
$form['emergency']['booking_guardian_phone_alt'] = array( $form['emergency']['booking_guardian_phone_alt'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Alternate Contact Number'), '#title' => t('Emergency Contact Alternate Contact Number'),
'#maxlength' => 30, '#maxlength' => 30,
'#size' => 30, '#size' => 30,
'#required' => FALSE, '#required' => FALSE,
@@ -902,14 +902,7 @@ function booking_form($node, &$form_state, $inserting = FALSE)
return $form; return $form;
} }
function booking_form_validate($form, &$form_state) {
function booking_form_validate($form, &$form_state)
{
// return _booking_validate($form_state['values']['form_id'], $form_state['input']);
//}
//function _booking_validate($node, &$form_state)
//{
global $event; global $event;
$node = $form_state['values']['form_id']; $node = $form_state['values']['form_id'];
$data = $form_state['input']; $data = $form_state['input'];
@@ -1058,10 +1051,21 @@ function booking_form_validate($form, &$form_state)
//verify an australian mobile number is entered correctly if applicable //verify an australian mobile number is entered correctly if applicable
if (($data['booking_mobile'] != '') && ($data['booking_country'] == 'Australia') && (!_valid_australian_mobile_number($data['booking_mobile']))) if (($data['booking_mobile'] != '') && ($data['booking_country'] == 'Australia') && (!_valid_australian_mobile_number($data['booking_mobile'])))
form_set_error('booking_mobile', t('You have entered an invalid mobile phone number.')); form_set_error('booking_mobile', t('You have entered an invalid mobile phone number.'));
//validate guardian phone number
if ($data['booking_country'] == 'Australia') {
if (!_valid_australian_mobile_number($data['booking_guardian_phone']) {
form_set_error('booking_guardian_phone', t('You have entered an invalid contact phone number for your emergency contact.'));
}
} else {
if (!_valid_phone_number($data['booking_guardian_phone']) {
form_set_error('booking_guardian_phone', t('You have entered an invalid contact phone number for your emergency contact.'));
}
}
//verify guardian phone number(s) //verify alternate guardian phone number
if (($data['booking_guardian_phone'] != '') && (!_valid_phone_number($data['booking_guardian_phone']))) if (($data['booking_guardian_phone_alt'] != '') && (!_valid_phone_number($data['booking_guardian_phone_alt'])))
form_set_error('booking_guardian_phone', t('You have entered an contact phone number for your emergency contact.')); form_set_error('booking_guardian_phone_alt', t('You have entered an invalid alternate contact phone number for your emergency contact.'));
//check the terms and conditions have been agreed to. Do this one last so it stands out more //check the terms and conditions have been agreed to. Do this one last so it stands out more
if ($data['booking_agreement'] == 0) if ($data['booking_agreement'] == 0)