From: Steve Sutton Date: Thu, 10 Nov 2016 16:29:37 +0000 (-0500) Subject: Changes for working on php5.6 and nginx X-Git-Tag: v1.0.0^2~3 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9a84125c44300b96619a7ea8cc0c0b47ceeee042;p=prog%2Fws0%2FRegistrations_V3.git Changes for working on php5.6 and nginx These changes are for working with php5.6 and within wordpress. --- diff --git a/front-end/Views/registrations_step0.html b/front-end/Views/registrations_step0.html index 15bbc1b..7122f14 100644 --- a/front-end/Views/registrations_step0.html +++ b/front-end/Views/registrations_step0.html @@ -36,7 +36,7 @@
-
+

{word_Member} Login

@@ -54,7 +54,7 @@ - Forgot my {word_Password} + Forgot my {word_Password} @@ -77,7 +77,7 @@

Guest Login

@@ -95,7 +95,7 @@ - Forgot my {word_Password} + Forgot my {word_Password}
@@ -119,9 +119,9 @@
- Select {word_Events} + Select {word_Events}
-
\ No newline at end of file +
diff --git a/front-end/Views/registrations_step1.html b/front-end/Views/registrations_step1.html index 2125cdd..8bce2ab 100644 --- a/front-end/Views/registrations_step1.html +++ b/front-end/Views/registrations_step1.html @@ -42,14 +42,14 @@

- Current Registered User:  {userFname} {userLname}    (not me or log me out) + Current Registered User:  {userFname} {userLname}    (not me or log me out)
(A {customer_long_name} member)

- {customer_long_name} Member logged in
- Log Out + {customer_long_name} Member logged in
- Log Out {/if:have_registered_users}--> @@ -57,7 +57,7 @@ -
+

@@ -69,7 +69,7 @@ - +

@@ -77,7 +77,7 @@
-
+

Select {word_category} of {word_Event} or search by month.

@@ -96,7 +96,7 @@

- +

Select from the following

@@ -154,8 +154,8 @@

- View Cart - Check Out + View Cart + Check Out
@@ -166,12 +166,12 @@
-

{name}

- Select {word_Category} +

{name}

+ Select {word_Category} - Select {word_Category} + Select {word_Category} {/if:doing_sub_categories}-->
@@ -184,9 +184,9 @@
- {title_select_event_button} + {title_select_event_button} -

{reg_name}

+

{reg_name}

{reg_short_descr}

@@ -242,9 +242,9 @@
- {title_select_event_button} + {title_select_event_button} -

{reg_name}

+

{reg_name}

{reg_short_descr}

@@ -309,12 +309,12 @@ -

{name}

+

{name}

{descr}
-

{reg_name}

+

{reg_name}

{reg_short_descr}

@@ -371,7 +371,7 @@
-

{reg_name}

+

{reg_name}

{reg_short_descr}

diff --git a/front-end/Views/registrations_step2.html b/front-end/Views/registrations_step2.html index b967910..6645044 100644 --- a/front-end/Views/registrations_step2.html +++ b/front-end/Views/registrations_step2.html @@ -31,7 +31,7 @@

- Current Registered User:  {userFname} {userLname}    (not me or log me out) + Current Registered User:  {userFname} {userLname}    (not me or log me out)
(A {customer_long_name} member)

@@ -45,12 +45,12 @@ - Select More + Select More - View Cart - Check Out + View Cart + Check Out @@ -79,15 +79,15 @@

Sorry, currently sold out.

- {title_select_event_button} + {title_select_event_button} -

{name}

+

{name}

{/if:full}--> - {title_select_event_button} + {title_select_event_button} -

{name}

+

{name}

{/if:limited}--> {/if:too_late}--> @@ -180,15 +180,15 @@

Sorry, currently sold out.

- {title_select_event_button} + {title_select_event_button} -

{name}

+

{name}

{/if:full}--> - {title_select_event_button} + {title_select_event_button} -

{name}

+

{name}

{/if:limited}--> {/if:too_late}--> diff --git a/front-end/Views/registrations_step3.html b/front-end/Views/registrations_step3.html index 1e1293c..987c391 100644 --- a/front-end/Views/registrations_step3.html +++ b/front-end/Views/registrations_step3.html @@ -52,16 +52,16 @@ function do_wait()

- Current Registered User:  {userFname} {userLname}    (not me or log me out) + Current Registered User:  {userFname} {userLname}    (not me or log me out)
(A {customer_long_name} member)

- Select More + Select More - View Cart - Check Out + View Cart + Check Out @@ -69,7 +69,7 @@ function do_wait()
- + diff --git a/front-end/Views/registrations_step4.html b/front-end/Views/registrations_step4.html index 508a1d4..fb814d4 100644 --- a/front-end/Views/registrations_step4.html +++ b/front-end/Views/registrations_step4.html @@ -23,18 +23,18 @@ - {customer_long_name} Member logged in - Log Out + {customer_long_name} Member logged in - Log Out - Select More + Select More - Check Out + Check Out

- Current Registered User:  {userFname} {userLname}    (not me or log me out) + Current Registered User:  {userFname} {userLname}    (not me or log me out)
(A {customer_long_name} member)

@@ -86,7 +86,7 @@
- Remove + Remove @@ -137,9 +137,9 @@

You do not have any {word_events} in your cart.

{/if:haveCart}--> - Select More + Select More - Check Out + Check Out diff --git a/front-end/Views/registrations_step5.html b/front-end/Views/registrations_step5.html index b7faa70..a1da616 100644 --- a/front-end/Views/registrations_step5.html +++ b/front-end/Views/registrations_step5.html @@ -66,10 +66,6 @@ hide('check_input'); inputDisable('check_input'); - - hide('call_from_merchant_input'); - // inputDisable('call_from_merchant_input'); - hide('cash_input'); inputDisable('cash_input'); @@ -97,15 +93,6 @@ } } - - x = document.getElementById('call_from_merchant_button'); - if (x) { - if( x.checked ) { - show('call_from_merchant_input', 'inline'); - inputEnable('call_from_merchant_input'); - } - } - x = document.getElementById('cash_button'); if (x) { @@ -181,7 +168,7 @@ - {customer_long_name} Member logged in - Log Out + {customer_long_name} Member logged in - Log Out @@ -196,14 +183,14 @@
- Select More + Select More - View Cart + View Cart - + {form_data} @@ -211,7 +198,7 @@

- Current Registered User:  {userFname} {userLname}    (not me or log me out) + Current Registered User:  {userFname} {userLname}    (not me or log me out)
(A {customer_long_name} member)

diff --git a/front-end/Views/registrations_step6.html b/front-end/Views/registrations_step6.html index 9457f19..c7a8859 100644 --- a/front-end/Views/registrations_step6.html +++ b/front-end/Views/registrations_step6.html @@ -134,7 +134,7 @@ - Return to {word_Events} + Return to {word_Events} diff --git a/front-end/registrations.inc b/front-end/registrations.inc index f9c42c6..9f8d462 100644 --- a/front-end/registrations.inc +++ b/front-end/registrations.inc @@ -1,4 +1,4 @@ -event_registration->organization." Password Reset", "\nPlease click on the link below to reset the password for your ".$config->event_registration->organization." account.\n\n" ."You will need to enter the reset code provided when you requested us to reset your account password.\n\n" - .BASE_SECURE_URL.'index.php?catid='.$config->event_registration->event_page.'&Action=ResetPassword&ResetID='.$user_data['id'] + .BASE_SECURE_URL.'?catid='.$config->event_registration->event_page.'&Action=ResetPassword&ResetID='.$user_data['id'] ."\n\nPlease call ".$config->event_registration->organization." at ".$config->event_registration->organization_phone." if you need further assistance.\n\n" ."Sincerely,\n".$config->event_registration->organization."\n\n", "From: ".$config->event_registration->organization." <".$config->event_registration->organization_from_email.">\n"