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 (file)
--- a/front-end/Views/registrations_step0.html
+++ b/front-end/Views/registrations_step0.html
@@ -36,7 +36,7 @@
                <hr class="regItemHR">
                <div id="introMembers">
                        <div style="float: right; width: 300px;">
-                               <form action="{base_secure_url}index.php?catid={category_id}{preview}" method="POST">
+                               <form action="{base_secure_url}?catid={category_id}{preview}" method="POST">
                                        <input type="hidden" name="Action" value="Step0"> <input type="hidden" name="Option" value="MemberLogin">
                                        <center>
                                                <h3>{word_Member} Login</h3>
@@ -54,7 +54,7 @@
                                                </tr>
                                                <tr>
                                                        <td><input type="submit" value="Sign In" class="pseudoButton"></td>
-                                                       <td><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=ForgotPassword&Type=Member">Forgot my {word_Password}</a></td>
+                                                       <td><a href="{base_secure_url}?catid={category_id}{preview}&Action=ForgotPassword&Type=Member">Forgot my {word_Password}</a></td>
                                                </tr>
                                        </table>
                                </form>
@@ -77,7 +77,7 @@
                                        <h3><!--{if:have_members=YES}-->Guest<!--{else:have_members}Registrant{/if:have_members}--> Login</h3>
                                </center>
                                <form
-                                       action="{base_secure_url}index.php?catid={category_id}{preview}"
+                                       action="{base_secure_url}?catid={category_id}{preview}"
                                        method="POST">
                                        <input type="hidden" name="Action" value="Step0"> 
                                        <input type="hidden" name="count" value="{login_count}"> 
@@ -95,7 +95,7 @@
                                                </tr>
                                                <tr>
                                                        <td><input type="submit" value="Sign In"></td>
-                                                       <td><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=ForgotPassword&Type=NonMember">Forgot my {word_Password}</a></td>
+                                                       <td><a href="{base_secure_url}?catid={category_id}{preview}&Action=ForgotPassword&Type=NonMember">Forgot my {word_Password}</a></td>
                                                </tr>
                                        </table>
                                </form>
@@ -119,9 +119,9 @@
 <br style="clear: both;">
                        <hr class="regItemHR">
        <!--{if:categories_on_intro_page=NO}-->
-                       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step1" class="button wide"><span>Select {word_Events}</span></a>
+                       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step1" class="button wide"><span>Select {word_Events}</span></a>
        <!--{/if:categories_on_intro_page}-->
                </div>
        </div>
 </div>
-<br clear="all">
\ No newline at end of file
+<br clear="all">

diff --git a/front-end/Views/registrations_step1.html b/front-end/Views/registrations_step1.html
index 2125cdd..8bce2ab 100644 (file)
--- a/front-end/Views/registrations_step1.html
+++ b/front-end/Views/registrations_step1.html
@@ -42,14 +42,14 @@
        <!--{if:haveUser=YES}-->
                <hr>
                <p>
-                       <b>Current Registered User:&nbsp;&nbsp;</b>{userFname}&nbsp;{userLname}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{base_secure_url}index.php?catid={category_id}{preview}&logout=YES">(not me or log me out)</a>  
+                       <b>Current Registered User:&nbsp;&nbsp;</b>{userFname}&nbsp;{userLname}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{base_secure_url}?catid={category_id}{preview}&logout=YES">(not me or log me out)</a>
                        <!--{if:userIsMember=YES}--><br>(A {customer_long_name} member)<!--{/if:userIsMember}-->        
                </p>
        <!--{/if:haveUser}-->
   <!--{else:have_registered_users}
     <!--{if:have_members=YES}-->
        <!--{if:haveUser=YES}-->
-            <b>{customer_long_name} Member logged in</b><br> - <a href="{base_secure_url}index.php?catid={category_id}{preview}&logout=YES">Log Out</a>
+            <b>{customer_long_name} Member logged in</b><br> - <a href="{base_secure_url}?catid={category_id}{preview}&logout=YES">Log Out</a>
        <!--{/if:haveUser}-->
     <!--{/if:have_members}-->
   {/if:have_registered_users}-->
@@ -57,7 +57,7 @@
 <!--{/if:extending_step0}-->
   
 <!--{if:select_by_code=YES}-->
-            <form action="{base_secure_url}index.php?catid={category_id}{preview}" method="POST">
+            <form action="{base_secure_url}?catid={category_id}{preview}" method="POST">
                 <input type="hidden" name="Action" value="Step2">
                                <input type="hidden" name="todo" value="0">
                 <p>
@@ -69,7 +69,7 @@
 <!--{/if:select_by_code}-->
 
 <!--{if:selection=SUB_CATEGORY}-->
-    <form action="{base_secure_url}index.php?catid={category_id}{preview}" method="POST">
+    <form action="{base_secure_url}?catid={category_id}{preview}" method="POST">
         <button name="Action" value="Step1">Select a Different {word_Category}</button>
     </form>
 <!--{/if:selection}-->
@@ -77,7 +77,7 @@
   <!--{if:haveMonths=YES}-->
          <!--{if:select_by_month=YES}-->
         <div class="regItem">
-            <form action="{base_secure_url}index.php?catid={category_id}{preview}" method="POST">
+            <form action="{base_secure_url}?catid={category_id}{preview}" method="POST">
                 <input type="hidden" name="Action" value="Step2">
                 <h3>Select {word_category} of {word_Event} or search by month.</h3>
                 <p>
@@ -96,7 +96,7 @@
   
   <!--{if:have_picklists=YES}-->
         <div class="regItem">
-            <form action="{base_secure_url}index.php?catid={category_id}{preview}" method="POST">
+            <form action="{base_secure_url}?catid={category_id}{preview}" method="POST">
                 <input type="hidden" name="Action" value="Step2">
                 <h3>Select from the following</h3>
                 <p>
@@ -154,8 +154,8 @@
        <div>
 <!--{if:display_only_mode=NO}-->
   <!--{if:haveCart=YES}-->
-               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step4" class="button showcart"><span>View Cart</span></a>
-               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step5" class="button checkout"><span>Check Out</span></a>
+               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step4" class="button showcart"><span>View Cart</span></a>
+               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step5" class="button checkout"><span>Check Out</span></a>
   <!--{/if:haveCart}-->
 <!--{/if:display_only_mode}-->
        </div>
@@ -166,12 +166,12 @@
                <!--{list:catlist}-->
                        <div class="regItem">
                   <!--{if:doing_sub_categories=YES}-->
-                               <h2 style="float: left;"><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step1&todo={id}">{name}</a></h2>
-                               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step1&todo={id}" class="button booknow"><span>Select {word_Category}</span></a>
+                               <h2 style="float: left;"><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step1&todo={id}">{name}</a></h2>
+                               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step1&todo={id}" class="button booknow"><span>Select {word_Category}</span></a>
               <!--{else:doing_sub_categories}
-                   <h2 style="float: left;"><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step2&todo={id}" style="margin: 0px;">{name}</a></h2>
+                   <h2 style="float: left;"><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step2&todo={id}" style="margin: 0px;">{name}</a></h2>
                 <!--{if:events_in_cat_list=NO}-->
-                               <a href="float: left;"><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step2&todo={id}" class="button booknow"><span>Select {word_Category}</span></a>
+                               <a href="float: left;"><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step2&todo={id}" class="button booknow"><span>Select {word_Category}</span></a>
                         <!--{/if:events_in_cat_list}-->
               {/if:doing_sub_categories}-->
                        <br clear="all">
@@ -184,9 +184,9 @@
                                <!--{list:events}-->
                                        <div class="regListItem">               
                                  <!--{if:show_event_button=YES}-->
-                                               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={reg_id}" class="button booknow" style="float: right;"><span>{title_select_event_button}</span></a>                                              
+                                               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={reg_id}" class="button booknow" style="float: right;"><span>{title_select_event_button}</span></a>
                                  <!--{/if:show_event_button}-->
-                                               <h3><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={reg_id}">{reg_name}</a><br></h3>
+                                               <h3><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={reg_id}">{reg_name}</a><br></h3>
                                                <!--{if:reg_have_image=YES}--><tr><td colspan="2"><img src="{image_thumb}{reg_image}" alt="" class="regImage"></td></tr><!--{/if:reg_have_image}-->
                                                <p>{reg_short_descr}</p>
                                                <table border="0" cellspacing="0" cellpadding="0">
@@ -242,9 +242,9 @@
                                <!--{/sep:events}-->
                                        <div class="regListItem">
                                  <!--{if:show_event_button=YES}-->
-                                               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={reg_id}" class="button booknow" style="float: right;"><span>{title_select_event_button}</span></a>                                              
+                                               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={reg_id}" class="button booknow" style="float: right;"><span>{title_select_event_button}</span></a>
                                  <!--{/if:show_event_button}-->
-                                               <h3><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={reg_id}">{reg_name}</a><br></h3>
+                                               <h3><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={reg_id}">{reg_name}</a><br></h3>
                                                <!--{if:reg_have_image=YES}--><tr><td colspan="2"><img src="{image_thumb}{reg_image}" alt="" class="regImage"></td></tr><!--{/if:reg_have_image}-->
                                                <p>{reg_short_descr}</p>
                                                <table border="0" cellspacing="0" cellpadding="0">
@@ -309,12 +309,12 @@
                <!--{if:have_image=YES}-->
                                <img src="{image_midsized}{image}" alt="" class="regImage">
                <!--{/if:have_image}-->
-                               <h2><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step2&subcat={id}">{name}</a></h2>
+                               <h2><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step2&subcat={id}">{name}</a></h2>
                                {descr}<br clear="all">
                        <!--{if:have_events=YES}-->
                                <!--{list:events}-->
                                        <div class="regListItem">
-                                               <h3><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={reg_id}">{reg_name}</a><br></h3>
+                                               <h3><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={reg_id}">{reg_name}</a><br></h3>
                                                <!--{if:reg_have_image=YES}--><tr><td colspan="2"><img src="{image_thumb}{reg_image}" alt="" class="regImage"></td></tr><!--{/if:reg_have_image}-->
                                                <p>{reg_short_descr}</p>
                                                <table border="0" cellspacing="0" cellpadding="0">
@@ -371,7 +371,7 @@
                                        <hr class="shortHR">
                                <!--{/sep:events}-->
                                        <div class="regListItem">
-                                               <h3><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={reg_id}">{reg_name}</a><br></h3>
+                                               <h3><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={reg_id}">{reg_name}</a><br></h3>
                                                <!--{if:reg_have_image=YES}--><tr><td colspan="2"><img src="{image_thumb}{reg_image}" alt="" class="regImage"></td></tr><!--{/if:reg_have_image}-->
                                                <p>{reg_short_descr}</p>
                                                <table border="0" cellspacing="0" cellpadding="0">

diff --git a/front-end/Views/registrations_step2.html b/front-end/Views/registrations_step2.html
index b967910..6645044 100644 (file)
--- a/front-end/Views/registrations_step2.html
+++ b/front-end/Views/registrations_step2.html
@@ -31,7 +31,7 @@
     <!--{if:haveUser=YES}-->
         <hr>
         <p>
-                       <b>Current Registered User:&nbsp;&nbsp;</b>{userFname}&nbsp;{userLname}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{base_secure_url}index.php?catid={category_id}{preview}&logout=YES">(not me or log me out)</a>  
+                       <b>Current Registered User:&nbsp;&nbsp;</b>{userFname}&nbsp;{userLname}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{base_secure_url}?catid={category_id}{preview}&logout=YES">(not me or log me out)</a>
             <!--{if:userIsMember=YES}--><br>(A {customer_long_name} member)<!--{/if:userIsMember}--> 
         </p>
     <!--{/if:haveUser}-->
@@ -45,12 +45,12 @@
       <!--{/if:have_search_request}-->
     <!--{/if:static_page}-->
     <!--{if:doing_main_categories=YES}-->
-               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step1" class="button selectmore"><span>Select More</span></a>
+               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step1" class="button selectmore"><span>Select More</span></a>
     <!--{/if:doing_main_categories}-->
 <!--{if:display_only_mode=NO}-->       
        <!--{if:haveCart=YES}-->
-               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step4" class="button showcart"><span>View Cart</span></a>
-               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step5" class="button checkout"><span>Check Out</span></a>
+               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step4" class="button showcart"><span>View Cart</span></a>
+               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step5" class="button checkout"><span>Check Out</span></a>
        <!--{/if:haveCart}-->
 <!--{/if:display_only_mode}-->
 
@@ -79,15 +79,15 @@
             <p>Sorry, currently sold out.</p>                
            <!--{else:full}
                          <!--{if:show_event_button=YES}-->
-                       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}" class="button booknow"><span>{title_select_event_button}</span></a>
+                       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}" class="button booknow"><span>{title_select_event_button}</span></a>
                          <!--{/if:show_event_button}-->
-            <h2><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}">{name}</a></h2>
+            <h2><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}">{name}</a></h2>
             {/if:full}-->
          <!--{else:limited}
                          <!--{if:show_event_button=YES}-->
-                       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}" class="button booknow"><span>{title_select_event_button}</span></a>
+                       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}" class="button booknow"><span>{title_select_event_button}</span></a>
                          <!--{/if:show_event_button}-->
-                       <h2><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}">{name}</a></h2>
+                       <h2><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}">{name}</a></h2>
                 {/if:limited}-->
        {/if:too_late}-->
 
@@ -180,15 +180,15 @@
             <p>Sorry, currently sold out.</p>                
            <!--{else:full}
                          <!--{if:show_event_button=YES}-->
-                       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}" class="button booknow"><span>{title_select_event_button}</span></a>
+                       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}" class="button booknow"><span>{title_select_event_button}</span></a>
                          <!--{/if:show_event_button}-->
-            <h2><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}">{name}</a></h2>
+            <h2><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}">{name}</a></h2>
             {/if:full}-->
          <!--{else:limited}
                          <!--{if:show_event_button=YES}-->
-                       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}" class="button booknow"><span>{title_select_event_button}</span></a>
+                       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}" class="button booknow"><span>{title_select_event_button}</span></a>
                          <!--{/if:show_event_button}-->
-                       <h2><a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}">{name}</a></h2>
+                       <h2><a href="{base_secure_url}?catid={category_id}{preview}&Action=Step3&event_id={id}&page_title={page_title_enc}">{name}</a></h2>
                 {/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 (file)
--- a/front-end/Views/registrations_step3.html
+++ b/front-end/Views/registrations_step3.html
@@ -52,16 +52,16 @@ function do_wait()
     <!--{if:haveUser=YES}-->
     <hr>
     <p>
-               <b>Current Registered User:&nbsp;&nbsp;</b>{userFname}&nbsp;{userLname}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{base_secure_url}index.php?catid={category_id}{preview}&logout=YES">(not me or log me out)</a>  
+               <b>Current Registered User:&nbsp;&nbsp;</b>{userFname}&nbsp;{userLname}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{base_secure_url}?catid={category_id}{preview}&logout=YES">(not me or log me out)</a>
         <!--{if:userIsMember=YES}--><br>(A {customer_long_name} member)<!--{/if:userIsMember}--> 
     </p>
     <!--{/if:haveUser}-->
        
-               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step1" class="button selectmore"><span>Select More</span></a>
+               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step1" class="button selectmore"><span>Select More</span></a>
 <!--{if:display_only_mode=NO}-->
     <!--{if:haveCart=YES}-->
-               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step4" class="button showcart"><span>View Cart</span></a>
-               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step5" class="button checkout"><span>Check Out</span></a>
+               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step4" class="button showcart"><span>View Cart</span></a>
+               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step5" class="button checkout"><span>Check Out</span></a>
        <!--{/if:haveCart}-->
 <!--{/if:display_only_mode}--> 
 <!--{if:display_only_mode=YES}-->      
@@ -69,7 +69,7 @@ function do_wait()
 <!--{/if:display_only_mode}--> 
 
        <hr>
-    <form action="{base_secure_url}index.php?catid={category_id}{preview}" name="step3" method="post" enctype="multipart/form-data">
+    <form action="{base_secure_url}?catid={category_id}{preview}" name="step3" method="post" enctype="multipart/form-data">
         <input type="hidden" name="Action" value="{next_step}">
         <input type="hidden" name="event_id" value="{event_id}">
         <input type="hidden" name="select_event" value="YES">

diff --git a/front-end/Views/registrations_step4.html b/front-end/Views/registrations_step4.html
index 508a1d4..fb814d4 100644 (file)
--- a/front-end/Views/registrations_step4.html
+++ b/front-end/Views/registrations_step4.html
@@ -23,18 +23,18 @@
 
     <!--{if:have_members=YES}-->
        <!--{if:haveUser=YES}-->
-            <b>{customer_long_name} Member logged in</b> - <a href="{base_secure_url}index.php?catid={category_id}{preview}&logout=YES">Log Out</a>
+            <b>{customer_long_name} Member logged in</b> - <a href="{base_secure_url}?catid={category_id}{preview}&logout=YES">Log Out</a>
        <!--{/if:haveUser}-->
     <!--{/if:have_members}-->       
 
-       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step1" class="button selectmore"><span>Select More</span></a>
+       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step1" class="button selectmore"><span>Select More</span></a>
 <!--{if:haveCart=YES}-->
-       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step5" class="button checkout"><span>Check Out</span></a>
+       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step5" class="button checkout"><span>Check Out</span></a>
 <!--{/if:haveCart}-->
 
        <!--{if:haveUser=YES}-->
                <p>
-                       <b>Current Registered User:&nbsp;&nbsp;</b>{userFname}&nbsp;{userLname}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{base_secure_url}index.php?catid={category_id}{preview}&logout=YES">(not me or log me out)</a>  
+                       <b>Current Registered User:&nbsp;&nbsp;</b>{userFname}&nbsp;{userLname}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{base_secure_url}?catid={category_id}{preview}&logout=YES">(not me or log me out)</a>
                        <!--{if:userIsMember=YES}--><br>(A {customer_long_name} member)<!--{/if:userIsMember}-->                
                </p>
                <hr>
@@ -86,7 +86,7 @@
                                                                    </table>
                                                                        </td>
                                                                        <td valign="top" width="120px">
-                                                                               <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step2.5&delete_cart_id={cart_id}" class="button remove"><span>Remove</span></a>
+                                                                               <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step2.5&delete_cart_id={cart_id}" class="button remove"><span>Remove</span></a>
                                                                        </td>
                                                                </tr>
                                                        </table>                                            
@@ -137,9 +137,9 @@
        <h3>You do not have any {word_events} in your cart.</h3>
 {/if:haveCart}-->      
 
-       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step1" class="button selectmore"><span>Select More</span></a>
+       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step1" class="button selectmore"><span>Select More</span></a>
 <!--{if:haveCart=YES}-->
-       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step5" class="button checkout"><span>Check Out</span></a>
+       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step5" class="button checkout"><span>Check Out</span></a>
 <!--{/if:haveCart}-->
        
        

diff --git a/front-end/Views/registrations_step5.html b/front-end/Views/registrations_step5.html
index b7faa70..a1da616 100644 (file)
--- a/front-end/Views/registrations_step5.html
+++ b/front-end/Views/registrations_step5.html
@@ -66,10 +66,6 @@
                hide('check_input');
                inputDisable('check_input');
        <!--{/if:pay_by_check}-->
-       <!--{if:call_from_merchant!No}-->
-               hide('call_from_merchant_input');
-        //     inputDisable('call_from_merchant_input');
-       <!--{/if:call_from_merchant}-->
        <!--{if:pay_by_cash!No}-->
                hide('cash_input');
                inputDisable('cash_input');
@@ -97,15 +93,6 @@
                    }
                }
        <!--{/if:pay_by_check}-->
-    <!--{if:call_from_merchant!No}-->
-        x = document.getElementById('call_from_merchant_button');
-        if (x) {
-            if( x.checked ) {
-                show('call_from_merchant_input', 'inline');
-                inputEnable('call_from_merchant_input');
-            }
-        }
-    <!--{/if:call_from_merchant}-->
        <!--{if:pay_by_cash!No}-->
            x = document.getElementById('cash_button');
            if (x) {
@@ -181,7 +168,7 @@
 
     <!--{if:have_members=YES}-->
        <!--{if:haveUser=YES}-->
-            <b>{customer_long_name} Member logged in</b> - <a href="{base_secure_url}index.php?catid={category_id}{preview}&logout=YES">Log Out</a>
+            <b>{customer_long_name} Member logged in</b> - <a href="{base_secure_url}?catid={category_id}{preview}&logout=YES">Log Out</a>
        <!--{/if:haveUser}-->
     <!--{/if:have_members}-->       
 
@@ -196,14 +183,14 @@
         </div>
   <!--{/if:have_reason}-->
 
-       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step1" class="button selectmore"><span>Select More</span></a>
+       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step1" class="button selectmore"><span>Select More</span></a>
 <!--{if:display_only_mode=NO}-->
   <!--{if:haveCart=YES}-->
-       <a href="{base_secure_url}index.php?catid={category_id}{preview}&Action=Step4" class="button showcart"><span>View Cart</span></a>
+       <a href="{base_secure_url}?catid={category_id}{preview}&Action=Step4" class="button showcart"><span>View Cart</span></a>
   <!--{/if:haveCart}-->
 <!--{/if:display_only_mode}-->  
 
-    <form action="{base_secure_url}index.php?catid={category_id}{preview}" name="step3" method="post">
+    <form action="{base_secure_url}?catid={category_id}{preview}" name="step3" method="post">
         <input type="hidden" name="Action" value="{next_step}">
         <input type="hidden" name="checkoutPage" value="YES">
         {form_data}
@@ -211,7 +198,7 @@
        <!--{if:haveUser=YES}-->
                <hr>
                <p>
-                       <b>Current Registered User:&nbsp;&nbsp;</b>{userFname}&nbsp;{userLname}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{base_secure_url}index.php?catid={category_id}{preview}&logout=YES">(not me or log me out)</a>  
+                       <b>Current Registered User:&nbsp;&nbsp;</b>{userFname}&nbsp;{userLname}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{base_secure_url}?catid={category_id}{preview}&logout=YES">(not me or log me out)</a>
                        <!--{if:userIsMember=YES}--><br>(A {customer_long_name} member)<!--{/if:userIsMember}-->                
                </p>
        <!--{/if:haveUser}-->

diff --git a/front-end/Views/registrations_step6.html b/front-end/Views/registrations_step6.html
index 9457f19..c7a8859 100644 (file)
--- a/front-end/Views/registrations_step6.html
+++ b/front-end/Views/registrations_step6.html
@@ -134,7 +134,7 @@
             </TABLE>
         </TD>
       </TR>
-      <a href="{base_secure_url}index.php?catid={category_id}{preview}" class="pseudoButton">Return to {word_Events}</a>
+      <a href="{base_secure_url}?catid={category_id}{preview}" class="pseudoButton">Return to {word_Events}</a>
     </table>
   </BODY>
 </HTML>

diff --git a/front-end/registrations.inc b/front-end/registrations.inc
index f9c42c6..9f8d462 100644 (file)
--- a/front-end/registrations.inc
+++ b/front-end/registrations.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 /*****************************************************
  *
  *  Gaslight Media - Travel Industry Data System
@@ -17,8 +17,7 @@ define('THIS_SCRIPT', BASE_APP_URL."/Common/Registrations_V3/front-end/index.pht
 // Create user trace info. If this is an Admin user, just say Admin.
 $user_trace_info = $_SERVER['REMOTE_ADDR']." - ".date("m/d/Y H:i:s");
 
-$config = new Zend_Config_Ini('config/application.ini', strtolower($_ENV['GLM_HOST_ID']));
-
+$config = new Zend_Config_Ini(BASE.'config/application.ini', strtolower($_ENV['GLM_HOST_ID']));
 /*****************************************************
  *
  *  Generic data and misc setup
@@ -389,7 +388,7 @@ function getRegRates($r, $is_member, $config)
 }
 
 // Start Session
-session_start();
+//session_start();
 
 // Function to reset session data
 function reset_session() {
@@ -3459,7 +3458,7 @@ if ($Action == 'ResetPassword') {
                 $config->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"