From 62b47d2665e629d96207c99947007e9cfd9644b1 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 25 Sep 2018 12:12:39 -0400
Subject: [PATCH] Update search to bring in paging

Setting up paging in member search.
---
 glm-member-db/views/front/members/list.html | 16 ++++++++--------
 inc/custom.php                              |  1 +
 style.css                                   |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index cf0909e..067e9fe 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -256,17 +256,17 @@
 <div class="glm-member-list-listing-container">
 {if $settings.list_show_search_alpha && !apply_filters("is_page", 'search')}
     <div class="glm-alpha-links">
-        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$textSearch}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
+        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
   {foreach $alphaList as $a}
-        <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}{if $smarty.request.s}&s={$textSearch}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
+        <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}{if $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
   {/foreach}
    </div>
 {/if}
 
-{if $paging && !apply_filters("is_page", 'search')}
+{if $paging}
     <br>
-    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$textSearch}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
-    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$textSearch}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
+    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
+    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
     <br>
     showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
 {/if}
@@ -498,10 +498,10 @@
 
  {/if} {*end grid view check*}
 
-    {if $paging && !apply_filters("is_page", 'search')}
+    {if $paging}
         <br>
-        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$textSearch}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
-        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$textSearch}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
+        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$smarty.request.s|escape:'htmlall'}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
+        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$smarty.request.s|escape:'htmlall'}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
         <br>
         showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
     {/if}
diff --git a/inc/custom.php b/inc/custom.php
index a816359..3435cb0 100644
--- a/inc/custom.php
+++ b/inc/custom.php
@@ -127,6 +127,7 @@ add_filter('pre_get_posts', 'change_wp_search_size'); // Hook our custom functio
 function display_memberfindme_directory() {
     // Show MemberFindMe shortcode from Directory page
     //$_REQUEST['textSearch'] = $_REQUEST['s'];
+    $_REQUEST['s'] = stripslashes( $_REQUEST['s'] );
     $_REQUEST['action'] = 'list';
     $_REQUEST['event_name'] = $_REQUEST['s'];
     echo do_shortcode('[glm-members-list view="grid"]');
diff --git a/style.css b/style.css
index f400eac..a503f7c 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: http://underscores.me/
 Author: Underscores.me
 Author URI: http://underscores.me/
 Description: Description
-Version: 1.0.34
+Version: 1.0.35
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: wmta
-- 
2.17.1