From a7f474ec56db63e738a6fc1487eabc6c11546763 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Tue, 31 May 2016 17:44:45 +1000
Subject: [PATCH] convert travel page to full html text

---
 booking.tokens.inc |  2 +-
 booking.travel.inc | 25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/booking.tokens.inc b/booking.tokens.inc
index 59f9ba5..7c56804 100644
--- a/booking.tokens.inc
+++ b/booking.tokens.inc
@@ -274,7 +274,7 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text
 		'#format' => 'full_html',		
 	);	
 	$form['travel']['booking_travelform_page_post_text'] = array(
-		'#title' => t('Text to use at the end of the travel form'),
+		'#title' => t('Text to use at the end of the travel form. This is not displayed on the "travel form completed" page defined below.'),
 		'#type' => 'textarea',
 		'#description' => t(''),
 		'#default_value' => isset(variable_get('booking_travelform_page_post_text')['value']) ? variable_get('booking_travelform_page_post_text')['value'] : $defaults,
diff --git a/booking.travel.inc b/booking.travel.inc
index 4043cd3..26d2b97 100644
--- a/booking.travel.inc
+++ b/booking.travel.inc
@@ -35,18 +35,18 @@ function booking_travel_page()
   if ($person) {
     //load this person's data
     $node = node_load($person->nid);
-    
     $tokens = booking_define_personspecific_tokens($node);
     
     //watchdog('booking', 'Checking for existing travel form for: @info', array('@info' => var_export($person, TRUE)));
     
     //check for an existing travel form
     if (!empty($node->tid)) {
-      $output = token_replace(variable_get('booking_travelform_completed_page'), $tokens);
+      $inputtext = variable_get('booking_travelform_completed_page');
+      //$output = token_replace(variable_get('booking_travelform_completed_page'), $tokens);
       $return_array[] = array(
         'paragraph' => array(
           '#type' => 'markup',
-          '#markup' => $output
+          '#markup' => token_replace($inputtext['value'], $tokens),
         )
       );
     }
@@ -54,20 +54,31 @@ function booking_travel_page()
     else {
       //Output different text if this is for a married couple
       if ((variable_get('booking_enable_combined_pricing', 0) == 1) && $node->booking_partner_id > 0) {
-        $output = token_replace(variable_get('booking_travelform_married_page'), $tokens);
+        $inputtext = variable_get('booking_travelform_married_page');
+        //$output = token_replace(variable_get('booking_travelform_married_page'), $tokens);
       } else {
-        $output = token_replace(variable_get('booking_travelform_page'), $tokens);
+        $inputtext = variable_get('booking_travelform_page');
+       //$output = token_replace(variable_get('booking_travelform_page'), $tokens);
       }
-      
+      //text before form
       $return_array[] = array(
         'paragraph' => array(
           '#type' => 'markup',
-          '#markup' => $output
+          '#markup' => token_replace($inputtext['value'], $tokens),
         )
       );
+      //actual form
       $return_array[] = array(
         'form' => drupal_get_form('travel_form', true, $node->nid)
       );
+      //text after form
+      $afterform_text = variable_get('booking_travelform_page_post_text');
+      $return_array[] = array(
+        'paragraph' => array(
+          '#type' => 'markup',
+          '#markup' => token_replace($afterform_text['value'], $tokens),
+        )
+      );      
     }
     
     return $return_array;