From 2b98b1b790d27b9ae98cb4d52aa507437515a9f6 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 25 May 2017 13:05:47 -0400
Subject: [PATCH] changing the login form to use captcha

using the same login form used by the updated sites to integrate captcha for the members only
login page
---
 parts/glm-members-only-login-form.php | 81 +++++++++++++++------------
 sections/interior-page.php            |  2 -
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/parts/glm-members-only-login-form.php b/parts/glm-members-only-login-form.php
index a47937e..15e7763 100644
--- a/parts/glm-members-only-login-form.php
+++ b/parts/glm-members-only-login-form.php
@@ -1,38 +1,45 @@
-<div class="wp_login_error">
-    <p id="glm-member-login-notification">
-        <?php if( isset( $_GET['login'] ) && $_GET['login'] == 'failed' ) { ?>
-            The information you entered is incorrect. Please try again.
-        <?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); 
-                $supportEmail = $glmAssociateConfig['settings']['members_only_support_email'];
-                $supportPhone = $glmAssociateConfig['settings']['members_only_support_phone'];
-                $glmTerm = $glmAssociateConfig['terms']['term_member'];
-            ?>
-            Please log in with your <?php echo $glmTerm; ?> username and password.
+                        <div class="wp_login_error">
+                            <p id="glm-member-login-notification">
+                                <?php if( isset( $_GET['login'] ) && $_GET['login'] == 'failed' ) { ?>
+                                    The information you entered is incorrect. Please try again.
+                                <?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);
+                                        $supportEmail = $glmAssociateConfig['settings']['members_only_support_email'];
+                                        $supportPhone = $glmAssociateConfig['settings']['members_only_support_phone'];
+                                        $glmTerm = $glmAssociateConfig['terms']['term_member'];
+                                    ?>
+                                    Please log in with your <?php echo $glmTerm; ?> username and password.
 
-            <?php if ($supportEmail || $supportPhone) {
-                echo "<br>If you need assistance, ";
-                if ($supportEmail) { 
-                    echo "email (".$supportEmail.")";
-                    if ($supportPhone) {
-                        echo " or ";
-                    }
-                }
-                if ($supportPhone) {
-                    echo "call (".$supportPhone.")";
-                }
-            }
-            ?>
-        <?php } ?>
-    </p>
-</div> 
-<div id='glm-member-login-form'>
-    <?php 
-        update_option('glm_members_database_frontend_login_request', 'true');
-        wp_login_form(1, get_permalink()); 
-    ?>
-</div>
-<?php get_template_part('parts/glm-members-only-lostpass-form'); ?>
\ No newline at end of file
+                                    <?php if ($supportEmail || $supportPhone) {
+                                        echo "<br>If you need assistance, ";
+                                        if ($supportEmail) {
+                                            echo "email (".$supportEmail.")";
+                                            if ($supportPhone) {
+                                                echo " or ";
+                                            }
+                                        }
+                                        if ($supportPhone) {
+                                            echo "call (".$supportPhone.")";
+                                        }
+                                    }
+                                    ?>
+                                <?php } ?>
+                            </p>
+                        </div>
+                        <div id='glm-member-login-form'>
+                            <?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
diff --git a/sections/interior-page.php b/sections/interior-page.php
index bf907f3..10bb7bd 100644
--- a/sections/interior-page.php
+++ b/sections/interior-page.php
@@ -12,10 +12,8 @@
                                                 <?php get_template_part('parts/main-content'); ?>
                                             <?php } else if (get_the_ID() == get_option("glm_members_database_option_members_only_id")) {?>
                                                 <!-- Otherwise, if it's the main members only page, display content & form -->
-                                                        member db
                                                 <?php get_template_part('parts/glm-members-only-login-form'); ?>
                                             <?php } else { ?>
-                                               nothing
                                                 <!-- Otherwise, display main members only page content & form -->
                                                 <?php echo get_post_page_content(get_option("glm_members_database_option_members_only_id")); ?>
                                                 <?php get_template_part('parts/glm-members-only-login-form'); ?>
-- 
2.17.1