From 9011b364e26ed5c9bfacb61682721b0399b50ff4 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 11 May 2017 11:12:38 -0400
Subject: [PATCH] Update for captcha to be on member only login form.

Have to place the captcha into the member login form.
---
 parts/glm-members-only-login-form.php | 27 +++++++++++++++++----------
 parts/search-dropdown.php             | 11 ++++++-----
 style.css                             |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/parts/glm-members-only-login-form.php b/parts/glm-members-only-login-form.php
index 6acc2c6..b337e36 100644
--- a/parts/glm-members-only-login-form.php
+++ b/parts/glm-members-only-login-form.php
@@ -2,11 +2,11 @@
                             <p id="glm-member-login-notification">
                                 <?php if( isset( $_GET['login'] ) && $_GET['login'] == 'failed' ) { ?>
                                     The information you entered is incorrect. Please try again.
-                                <?php } 
+                                <?php }
                                     else if( isset( $_GET['login'] ) && $_GET['login'] == 'empty' ) { ?>
                                     Please enter both username and password.
-                                <?php } else { ?>    
-                                    <?php $glmAssociateConfig = apply_filters('glm_associate_config', null); 
+                                <?php } else { ?>
+                                    <?php $glmAssociateConfig = apply_filters('glm_associate_config', null);
                                         $supportEmail = $glmAssociateConfig['settings']['members_only_support_email'];
                                         $supportPhone = $glmAssociateConfig['settings']['members_only_support_phone'];
                                         $glmTerm = $glmAssociateConfig['terms']['term_member'];
@@ -15,7 +15,7 @@
 
                                     <?php if ($supportEmail || $supportPhone) {
                                         echo "<br>If you need assistance, ";
-                                        if ($supportEmail) { 
+                                        if ($supportEmail) {
                                             echo "email (".$supportEmail.")";
                                             if ($supportPhone) {
                                                 echo " or ";
@@ -28,11 +28,18 @@
                                     ?>
                                 <?php } ?>
                             </p>
-                        </div> 
+                        </div>
                         <div id='glm-member-login-form'>
-                            <?php 
-                                update_option('glm_members_database_frontend_login_request', 'true');
-                                wp_login_form(1, get_permalink()); 
-                            ?>
+                        <?php
+                            update_option('glm_members_database_frontend_login_request', 'true');
+                            $args = array(
+                                'echo'    => false,
+                                'form_id' => 'glm_login_form'
+                            );
+                            $loginForm = wp_login_form($args);
+                            $captcha   = apply_filters('cptch_display', '', 'glm_login_form');
+                            $form      = str_replace( '<p class="login-remember">', $captcha . '<p class="login-remember">', $loginForm );
+                            echo $form;
+                        ?>
                         </div>
-                        <?php get_template_part('parts/glm-members-only-lostpass-form'); ?>
\ No newline at end of file
+                        <?php get_template_part('parts/glm-members-only-lostpass-form'); ?>
diff --git a/parts/search-dropdown.php b/parts/search-dropdown.php
index 474a901..c217670 100644
--- a/parts/search-dropdown.php
+++ b/parts/search-dropdown.php
@@ -8,19 +8,20 @@
     <?php $url = get_permalink(118); ?>
     <form method="POST" action="<?php echo $url;?>?glm_action=list" class="category-search-form">
         <?php $categories = apply_filters('member_categories', false); ?>
-        
+
         <select name="categorySearch" id="member-categories" onchange='this.form.submit()'>
            <option value="all" disabled selected>Select a Category</option>
-            <?php foreach ($categories as $key=>$val){ ?>
+            <?php if( isset($categories) && is_array($categories) ){
+                    foreach ($categories as $key=>$val){ ?>
                 <?php if( $val['parent']['value'] !== 0){ ?>
                     <option value="<?php echo $val['id']; ?>">&nbsp;&nbsp;&nbsp;<?php echo $val['name']; ?></option>
                 <?php } else { ?>
                     <option value="<?php echo $val['id']; ?>"><?php echo $val['name']; ?></option>
-                <?php } ?>
-            <?php } ?>
+                <?php }  ?>
+            <?php } }?>
         </select>
 
         <input class="search-button button dropdown-search-button" type="submit" value="Search" name="">
     </form>
-    
+
 </div>
diff --git a/style.css b/style.css
index aef200a..21ba2c7 100644
--- a/style.css
+++ b/style.css
@@ -3,5 +3,5 @@ Theme Name: HarborCountry
 Author: Gaslight Media
 Author URI: http://www.gaslightmedia.com
 Description: A theme for HarborCountry
-Version: 1.0.15
+Version: 1.0.16
 */
-- 
2.17.1