From 7f585d5bbfd1dcf9db3bae94ad591d388fbabbb8 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 9 Jul 2019 09:43:34 -0400
Subject: [PATCH] Update theme files for newer smarty version.

Replacing {php} use in theme templates.
---
 glm-member-db-events/views/front/events/agenda.html  |  2 +-
 .../views/front/events/eventsFrontPage.html          |  6 +++---
 .../views/front/events/searchForm.html               |  2 +-
 glm-member-db/views/front/members/list.html          | 12 ++++++------
 index.php                                            |  5 +++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/glm-member-db-events/views/front/events/agenda.html b/glm-member-db-events/views/front/events/agenda.html
index 86f0970..c330875 100644
--- a/glm-member-db-events/views/front/events/agenda.html
+++ b/glm-member-db-events/views/front/events/agenda.html
@@ -81,7 +81,7 @@
                                         {if $event.image}<img style="float:right;" src="{$imgUrl}{$event.image}">{/if}
                                         {$event.intro}
                                         <div>
-                                            <a class="glm-read-more" href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/{else}?eventId={$event.id}{/if}?entity_template={php}echo $GLOBALS['entity_page_slug'];{/php}">Read More</a>
+                                            <a class="glm-read-more" href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/{else}?eventId={$event.id}{/if}?entity_template={$smarty.request.entity_page_slug}">Read More</a>
                                         </div>
                                     </div>
                                 </div>
diff --git a/glm-member-db-events/views/front/events/eventsFrontPage.html b/glm-member-db-events/views/front/events/eventsFrontPage.html
index 06586f0..9a63ff5 100644
--- a/glm-member-db-events/views/front/events/eventsFrontPage.html
+++ b/glm-member-db-events/views/front/events/eventsFrontPage.html
@@ -7,14 +7,14 @@
         {foreach $key as $events}
             {foreach $events as $event}
             <div class="glm-events-frontpage-event-container">
-                <a href="{$siteBaseUrl}event-detail/{$event.name_slug}/?entity_template={php}echo $GLOBALS['entity_page_slug'];{/php}?glm_event_from={$fromDate|unescape:"html"}">
+                <a href="{$siteBaseUrl}event-detail/{$event.name_slug}/?entity_template={$smarty.request.entity_page_slug}&glm_event_from={$fromDate|unescape:"html"}">
                    {if $event.image}
                     <div class="glm-events-frontpage-event-image"
                         {if $event.image}style="background: url('{$imgUrl}{$event.image}') bottom center no-repeat;background-size: cover;"{/if}>
                     </div>
                     {/if}
                 </a>
-                <a href="{$siteBaseUrl}event-detail/{$event.name_slug}/?entity_template={php}echo $GLOBALS['entity_page_slug'];{/php}?glm_event_from={$fromDate|unescape:"html"}">
+                <a href="{$siteBaseUrl}event-detail/{$event.name_slug}/?entity_template={$smarty.request.entity_page_slug}&glm_event_from={$fromDate|unescape:"html"}">
                     <div class="{if !$event.image}sidebar-full-width{/if} glm-events-frontpage-event-title">
                         {$event.name}
                     </div>
@@ -29,4 +29,4 @@
             {/foreach}
         {/foreach}
     {/foreach}
-</div>
\ No newline at end of file
+</div>
diff --git a/glm-member-db-events/views/front/events/searchForm.html b/glm-member-db-events/views/front/events/searchForm.html
index 1441809..34725da 100644
--- a/glm-member-db-events/views/front/events/searchForm.html
+++ b/glm-member-db-events/views/front/events/searchForm.html
@@ -13,7 +13,7 @@
                 </div>
 
                 <div class="small-12 small-text-center medium-7 medium-text-right columns">
-                    <a id="glm-event-add-event" href="{$siteBaseUrl}add-event/?entity_template={php}echo $GLOBALS['entity_page_slug'];{/php}" class="glm-button button">Add an Event</a>
+                    <a id="glm-event-add-event" href="{$siteBaseUrl}add-event/?entity_template={$smarty.request.entity_page_slug}" class="glm-button button">Add an Event</a>
                 </div>
             </div>
             <div class="row">
diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 9a64a10..60c4139 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -143,7 +143,7 @@
                 {/if}
                 <div class="glm-map-member-name">
                     {if $settings.list_map_show_detaillink && !$m.has_no_profile}
-                        <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/{if $settings.enable_multiple_profiles}{$m.id}/{/if}?entity_template={php}echo $GLOBALS['entity_page_slug'];{/php}">{$m.member_name}</a>
+                        <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/{if $settings.enable_multiple_profiles}{$m.id}/{/if}?entity_template={$smarty.request.entity_page_slug}">{$m.member_name}</a>
                     {else}
                         {$m.member_name}
                     {/if}
@@ -259,7 +259,7 @@
                     {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
 
                     {if $settings.list_show_detail_link && !$member.has_no_profile.value}
-                    <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/?entity_template={php}echo $GLOBALS['entity_page_slug'];{/php}">
+                    <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/?entity_template={$smarty.request.entity_page_slug}">
                     {/if}
 
                     {if $member.featured}
@@ -285,7 +285,7 @@
                     <div class="glm-member-list-info-wrapper">
                         <h4 class="glm-member-title">
                             {if $settings.list_show_detail_link && !$member.has_no_profile.value}
-                                <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?entity_template={php}echo $GLOBALS['entity_page_slug'];{/php}">
+                                <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?entity_template={$smarty.request.entity_page_slug}">
                                     {$member.member}
                                 </a>
                             {else}
@@ -306,11 +306,11 @@
                                     {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam}
                                         <li><a target="_blank" href="{$member.live_cam_url}">{$terms.term_webcam_cap}</a></li>
                                     {else if $member.live_cam_type.name == "Camera Image"}
-                                        <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?entity_template={php}echo $GLOBALS['entity_page_slug'];{/php}?expanded=live-cam">{$terms.term_webcam_cap}</a></li>
+                                        <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?entity_template={$smarty.request.entity_page_slug}?expanded=live-cam">{$terms.term_webcam_cap}</a></li>
                                     {/if}
                                 {/if}
 
-                                <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?entity_template={php}echo $GLOBALS['entity_page_slug'];{/php}">View&nbsp;More</a></li>
+                                <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?entity_template={$smarty.request.entity_page_slug}">View&nbsp;More</a></li>
                                 {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
                             </ul>
                         </div>
@@ -329,7 +329,7 @@
             <div class="glm-member-list-container glm-member-container small-12 columns">
                 {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
                  <!-- Member Logo - Medium and up-->
-                <a class="anchorWrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?entity_template={php}echo $GLOBALS['entity_page_slug'];{/php}">
+                <a class="anchorWrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?entity_template={$smarty.request.entity_page_slug}">
                     <div class="glm-member-list-data small-12 columns">
                         {if $member.logo && $settings.list_show_logo}
                         <div class="glm-member-list-image-wrapper right small-12 medium-4 columns {if !$settings.list_logo_for_mobile}mobile-hide{/if}">
diff --git a/index.php b/index.php
index 01e605a..cd2f510 100644
--- a/index.php
+++ b/index.php
@@ -26,6 +26,7 @@
                 $GLOBALS['entity_page_slug'] = 'default';
             }
         }
+        $_REQUEST['entity_page_slug'] = $GLOBALS['entity_page_slug'];
         // get_entity_template returns current page slug if current page is entity page
         //  returns parent entity page slug if child of entity page
         //  returns false if top-level non-entity
@@ -41,7 +42,7 @@
                         include "sections/front-page-header.php";
                         include "sections/front-page.php";
                     } else {
-                        include "sections/header.php";                        
+                        include "sections/header.php";
                         if (is_home() || is_page($GLOBALS['entity_page_slug']."-news")) {
                             include "sections/blog-home.php";
                         } else if (is_archive()) {
@@ -72,4 +73,4 @@
         <?php wp_footer();?>
         <script charset="utf-8" type="text/javascript">var switchTo5x=true;</script>
     </body>
-</html>
\ No newline at end of file
+</html>
-- 
2.17.1