Move these functions into main glmAssociate plugin.

Also admin link in members only goes to the main admin url.

diff --git a/functions.php b/functions.php
index bec1c0e..3f01ada 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -359,44 +359,6 @@ if (!function_exists('is_in_tree')) {
     }
 }
 
-/**
- * Function Name:   front_end_login_fail.
- * Added for:       GLM Member DB front-end login failure custom redirection.
- * Description:     This redirects the failed login to the custom login page
- *                  instead of default login page with a modified url
-**/
-add_action( 'wp_login_failed', 'front_end_login_fail' );
-function front_end_login_fail( $username ) {
-    // Getting URL of the login page
-    $referrer = $_SERVER['HTTP_REFERER'];
-    // if there's a valid referrer, and it's not the default log-in screen
-    if( !empty( $referrer ) && !strstr( $referrer,'wp-login' ) && !strstr( $referrer,'wp-admin' ) ) {
-        echo get_permalink( get_option('glm_members_database_option_members_only_id') ) . "?login=failed";
-        wp_redirect( get_permalink( get_option('glm_members_database_option_members_only_id') ) . "?login=failed" );
-        exit;
-    }
-}
-
-/**
- * Function Name:   front_end_blank_credentials.
- * Added for:       GLM Member DB front-end login failure custom redirection.
- * Description:     This redirects to the custom login page if user name or
- *                  password is empty with a modified url
-**/
-add_action( 'authenticate', 'front_end_blank_credentials', 1, 3);
-function front_end_blank_credentials( $login, $username, $password ) {
-
-    // Getting URL of the login page
-    $referrer = ( isset( $_SERVER['HTTP_REFERER'] ) && $_SERVER['HTTP_REFERER'] ) ? : '';
-    // if there's a valid referrer, and it's not the default log-in screen
-    if( !empty( $referrer ) && !strstr( $referrer,'wp-login' ) && !strstr( $referrer,'wp-admin' ) ) {
-        if( $username == "" || $password == "" ){
-            wp_redirect( get_permalink( get_option('glm_members_database_option_members_only_id') ) . "?login=empty" );
-            exit;
-        }
-    }
-}
-
 // Remove Yoast SEO Dashboard Widget
 function remove_wpseo_dashboard_overview() {
        remove_meta_box( 'wpseo-dashboard-overview', 'dashboard', 'normal' );

diff --git a/glm-members-only-template.php b/glm-members-only-template.php
index 39b219c..416e5db 100644 (file)
--- a/glm-members-only-template.php
+++ b/glm-members-only-template.php
@@ -19,7 +19,7 @@ get_header(); ?>
                     <div class='glm-member-greeting'>Hello,     <?php $current_user = wp_get_current_user();echo $current_user->user_login ?>.</div>
                     <a class='button glm-button' href="<?php echo wp_logout_url( home_url() ); ?>">Logout</a>
                     <?php if (current_user_can("glm_members_member")) { ?>
-                        <a class='button glm-button' href='<?php echo get_admin_url() ?>admin.php?page=glm-members-admin-menu-member'>Enter Member Admin Area</a>
+                        <a class='button glm-button' href='<?php echo get_admin_url() ?>'>Enter Member Admin Area</a>
                     <?php } ?>
                 </div>
                 <?php if (is_in_tree(get_option("glm_member_db_option_member_detail_id"))) {}?>