From 33c040453add22f3bda180af7f93b10161452987 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Sat, 11 Jun 2016 15:23:16 +1000
Subject: [PATCH] validation improvements

---
 booking.regn_form.inc | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/booking.regn_form.inc b/booking.regn_form.inc
index b16aaab..8d39b20 100644
--- a/booking.regn_form.inc
+++ b/booking.regn_form.inc
@@ -571,7 +571,7 @@ function booking_form($node, &$form_state, $inserting = FALSE)
   }  
   $form['emergency']['booking_guardian_name'] = array(
     '#type' => 'textfield',
-    '#title' => t('Parent/Guardian Name'),
+    '#title' => t('Emergency Contact Name'),
     '#maxlength' => 100,
     '#required' => TRUE,
     '#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(
     '#type' => 'textfield',
-    '#title' => t('Contact Email Address'),
+    '#title' => t('Emergency Contact Email Address'),
     '#size' => 30,
     '#required' => TRUE,
     '#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) {
     $form['emergency']['booking_guardian_email_confirm'] = array(
       '#type' => 'textfield',
-      '#title' => t('Confirm Contact Email Address'),
+      '#title' => t('Confirm Emergency Contact Email Address'),
       '#size' => 30,
       '#required' => TRUE,
       '#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(
     '#type' => 'textfield',
-    '#title' => t('Mobile Phone Contact Number'),
+    '#title' => t('Emergency Contact Mobile Phone Number'),
     '#maxlength' => 30,
     '#size' => 30,
     '#required' => TRUE,
@@ -612,7 +612,7 @@ function booking_form($node, &$form_state, $inserting = FALSE)
   );
   $form['emergency']['booking_guardian_phone_alt'] = array(
     '#type' => 'textfield',
-    '#title' => t('Alternate Contact Number'),
+    '#title' => t('Emergency Contact Alternate Contact Number'),
     '#maxlength' => 30,
     '#size' => 30,
     '#required' => FALSE,
@@ -902,14 +902,7 @@ function booking_form($node, &$form_state, $inserting = FALSE)
   return $form;
 }
 
-
-
-function booking_form_validate($form, &$form_state)
-{
-//  return _booking_validate($form_state['values']['form_id'], $form_state['input']);
-//}
-//function _booking_validate($node, &$form_state)
-//{
+function booking_form_validate($form, &$form_state) {
   global $event;
   $node = $form_state['values']['form_id'];
   $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
   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.'));
+
+  //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)
-  if (($data['booking_guardian_phone'] != '') && (!_valid_phone_number($data['booking_guardian_phone'])))
-    form_set_error('booking_guardian_phone', t('You have entered an contact phone number for your emergency contact.'));
+  //verify alternate guardian phone number
+  if (($data['booking_guardian_phone_alt'] != '') && (!_valid_phone_number($data['booking_guardian_phone_alt'])))
+    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
   if ($data['booking_agreement'] == 0)