From b64823ed9fd6066d7f8e1f538617be09430c21d7 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Wed, 4 May 2016 13:33:50 +1000 Subject: [PATCH 1/7] Debug info for paypal landing page token --- booking.regn_form.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/booking.regn_form.inc b/booking.regn_form.inc index 3a5bff4..e783a04 100644 --- a/booking.regn_form.inc +++ b/booking.regn_form.inc @@ -1456,6 +1456,8 @@ function booking_payment_completed_page() $bookingTitle = !empty($event->booking_eventname) ? $event->booking_eventname : 'Event'; drupal_set_title($bookingTitle . ' Registration Completed'); + watchdog('booking_debug', "
Paypal landing page token:\n@info
", array('@info' => print_r( variable_get('booking_regn_completed_page'), true))); + $output = token_replace(variable_get('booking_regn_completed_page'), booking_define_tokens()); $return_array[] = array( 'paragraph' => array( From 157ea12fc106118910511b67442874e1e84f78d7 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Wed, 4 May 2016 13:37:31 +1000 Subject: [PATCH 2/7] Update booking_payment_completed_page --- booking.regn_form.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/booking.regn_form.inc b/booking.regn_form.inc index e783a04..587a2a6 100644 --- a/booking.regn_form.inc +++ b/booking.regn_form.inc @@ -1455,10 +1455,10 @@ function booking_payment_completed_page() //set the page title $bookingTitle = !empty($event->booking_eventname) ? $event->booking_eventname : 'Event'; drupal_set_title($bookingTitle . ' Registration Completed'); + $input = variable_get('booking_regn_completed_page'); + watchdog('booking_debug', "
Paypal landing page token:\n@info
", array('@info' => print_r($input['value'] , true))); - watchdog('booking_debug', "
Paypal landing page token:\n@info
", array('@info' => print_r( variable_get('booking_regn_completed_page'), true))); - - $output = token_replace(variable_get('booking_regn_completed_page'), booking_define_tokens()); + $output = token_replace($input['value'], booking_define_tokens()); $return_array[] = array( 'paragraph' => array( '#type' => 'markup', From 4dd2f777bd517fa8ce6425e7ede5e9b19fe186bd Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Wed, 4 May 2016 13:40:57 +1000 Subject: [PATCH 3/7] Update booking_regn_completed_page token --- booking.tokens.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/booking.tokens.inc b/booking.tokens.inc index 5eb063a..4fe2245 100644 --- a/booking.tokens.inc +++ b/booking.tokens.inc @@ -197,7 +197,7 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text '#title' => t('Text to use for landing page on return from paypal website'), '#type' => 'textarea', '#description' => t(''), - '#default_value' => variable_get('booking_regn_completed_page', '

Thankyou for registering for [booking:eventname].

'), + '#default_value' => (variable_get('booking_regn_completed_page'))['value'], '#type' => 'text_format', '#format' => 'full_html', ); From 61c6e270c948e67f49bb30a0a56ad08caae0ccd1 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Wed, 4 May 2016 13:43:53 +1000 Subject: [PATCH 4/7] Update booking_regn_completed_page token --- booking.tokens.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/booking.tokens.inc b/booking.tokens.inc index 4fe2245..5a924b1 100644 --- a/booking.tokens.inc +++ b/booking.tokens.inc @@ -193,11 +193,13 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text '#description' => t(''), '#default_value' => variable_get('booking_regn_confirm_married_text', $booking_regn_confirm_married_text), ); + $booking_regn_completed_page_default = variable_get('booking_regn_completed_page'); + $booking_regn_completed_page = isset($booking_regn_completed_page_default['value']) ? $booking_regn_completed_page_default['value'] : '' $form['confirmation']['booking_regn_completed_page'] = array( '#title' => t('Text to use for landing page on return from paypal website'), '#type' => 'textarea', '#description' => t(''), - '#default_value' => (variable_get('booking_regn_completed_page'))['value'], + '#default_value' => $booking_regn_completed_page, '#type' => 'text_format', '#format' => 'full_html', ); From 6b6e4e433b403079831d678f17fb6a0c8e1b0a89 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Wed, 4 May 2016 13:44:16 +1000 Subject: [PATCH 5/7] Update booking.tokens.inc --- booking.tokens.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/booking.tokens.inc b/booking.tokens.inc index 5a924b1..8ceb23b 100644 --- a/booking.tokens.inc +++ b/booking.tokens.inc @@ -194,7 +194,7 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text '#default_value' => variable_get('booking_regn_confirm_married_text', $booking_regn_confirm_married_text), ); $booking_regn_completed_page_default = variable_get('booking_regn_completed_page'); - $booking_regn_completed_page = isset($booking_regn_completed_page_default['value']) ? $booking_regn_completed_page_default['value'] : '' + $booking_regn_completed_page = isset($booking_regn_completed_page_default['value']) ? $booking_regn_completed_page_default['value'] : ''; $form['confirmation']['booking_regn_completed_page'] = array( '#title' => t('Text to use for landing page on return from paypal website'), '#type' => 'textarea', From 470858f8bf40186616d2eb43f7008ef81293c1c3 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Wed, 4 May 2016 13:52:50 +1000 Subject: [PATCH 6/7] use 5.4+ style array dereference --- booking.tokens.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/booking.tokens.inc b/booking.tokens.inc index 8ceb23b..6d69825 100644 --- a/booking.tokens.inc +++ b/booking.tokens.inc @@ -193,13 +193,14 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text '#description' => t(''), '#default_value' => variable_get('booking_regn_confirm_married_text', $booking_regn_confirm_married_text), ); - $booking_regn_completed_page_default = variable_get('booking_regn_completed_page'); - $booking_regn_completed_page = isset($booking_regn_completed_page_default['value']) ? $booking_regn_completed_page_default['value'] : ''; + //$booking_regn_completed_page_default = variable_get('booking_regn_completed_page'); + //$booking_regn_completed_page = isset($booking_regn_completed_page_default['value']) ? $booking_regn_completed_page_default['value'] : ''; $form['confirmation']['booking_regn_completed_page'] = array( '#title' => t('Text to use for landing page on return from paypal website'), '#type' => 'textarea', '#description' => t(''), - '#default_value' => $booking_regn_completed_page, + //'#default_value' => $booking_regn_completed_page, + '#default_value' => isset(variable_get('booking_regn_completed_page')['value']) ? variable_get('booking_regn_completed_page')['value'] : '', '#type' => 'text_format', '#format' => 'full_html', ); @@ -756,4 +757,4 @@ function booking_define_personspecific_tokens($node) } return $tokens; -} \ No newline at end of file +} From 3f48b48fd9545b8260b04e263e87720c28cf02fa Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Wed, 4 May 2016 13:55:45 +1000 Subject: [PATCH 7/7] Update booking.tokens.inc --- booking.tokens.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/booking.tokens.inc b/booking.tokens.inc index 6d69825..c8a8efb 100644 --- a/booking.tokens.inc +++ b/booking.tokens.inc @@ -200,7 +200,7 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text '#type' => 'textarea', '#description' => t(''), //'#default_value' => $booking_regn_completed_page, - '#default_value' => isset(variable_get('booking_regn_completed_page')['value']) ? variable_get('booking_regn_completed_page')['value'] : '', + '#default_value' => isset(variable_get('booking_regn_completed_page')['value']) ? variable_get('booking_regn_completed_page')['value'] : $defaults, '#type' => 'text_format', '#format' => 'full_html', );