From: laury <laury@gaslightmedia.com>
Date: Wed, 25 May 2016 18:58:05 +0000 (-0400)
Subject: Login redirect fix
X-Git-Tag: v1.0.8^2~1^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9ae356df09379e7776ed94e975c05359cfca9c3f;p=WP-Plugins%2Fglm-member-db-contacts.git

Login redirect fix
---

diff --git a/index.php b/index.php
index 20eb693..4468459 100644
--- a/index.php
+++ b/index.php
@@ -230,34 +230,15 @@ if ($wpUserID) {
  * login based on their roles.
  */
 
-function my_login_redirect( $redirect_to, $request, $user ) {
-    if (get_option('glm_member_db_frontend_login_request') == false) {
-        update_option('glm_member_db_frontend_login_request', true);
-        global $user;
-
-        // Do we have a logged in user
-        if ( isset( $user->roles ) && is_array( $user->roles ) ) {
-
-            // If this is a non-contact user or one with a pre-existing non-contact login
-            foreach ($user->roles as $r) {
-                if (substr($r,0,12) != 'glm_members_') {
-                    // Go to normal destination for this user
-                    return $redirect_to;
-                }
-            }
-
-            // If we get here, this is a pure contact user, start them at their profile
-
-            return '/wp-admin/admin.php?page=glm-members-admin-menu-member';
-
-        }
+function my_login_redirect($redirect_to, $request) {
+    if (get_option('glm_member_db_frontend_login_request') == 'false') {
+        $redirect_to = get_admin_url() . "admin.php?page=glm-members-admin-menu-member";
+    } else {
+        update_option('glm_member_db_frontend_login_request', 'false');
     }
-
-    // No logged in user - So why is the "login_redirect" filter triggered anyway?
     return $redirect_to;
-
 }
-add_filter( 'login_redirect', 'my_login_redirect', 10, 3 );
+add_filter("login_redirect", "my_login_redirect", 10, 3);
 
 
 ?>
\ No newline at end of file