From 1933fe3600870b1c51198455f38dd75b11201999 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 12 Dec 2018 14:24:36 -0500
Subject: [PATCH] Redirect page once user logs in.

This will update the session.
---
 models/front/itinerary/list.php | 37 ++++++++++++++++++---------------
 views/front/itinerary/list.html | 13 ++++++++++++
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/models/front/itinerary/list.php b/models/front/itinerary/list.php
index b937ab5..95fa16a 100755
--- a/models/front/itinerary/list.php
+++ b/models/front/itinerary/list.php
@@ -82,6 +82,7 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio
         $membersNoEmails   = array();
         $formErrors        = array();
         $userInfo          = array();
+        $userLoggingIn     = false;
 
         if ( isset( $_SESSION['travel-list'] ) ) {
             foreach ( $_SESSION['travel-list'] as $item ) {
@@ -187,18 +188,25 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio
         case 'login':
             $email    = filter_var( $_REQUEST['username'], FILTER_VALIDATE_EMAIL );
             $password = filter_var( $_REQUEST['password'] );
-            $user_id  = $this->wpdb->get_var(
-                $this->wpdb->prepare(
-                    "SELECT id
-                       FROM " . GLM_MEMBERS_ITINERARY_PLUGIN_DB_PREFIX . "user
-                      WHERE email = %s
-                        AND password = md5(%s)",
-                    $email,
-                    $password
-                )
-            );
-            if ( $user_id ) {
+            $user_id  = false;
+            if ( !$email || !$password ) {
+                $loginFailed = true;
+            } else {
+                $user_id  = $this->wpdb->get_var(
+                    $this->wpdb->prepare(
+                        "SELECT id
+                           FROM " . GLM_MEMBERS_ITINERARY_PLUGIN_DB_PREFIX . "user
+                          WHERE email = %s
+                            AND password = md5(%s)",
+                        $email,
+                        $password
+                    )
+                );
+            }
+            if ( $user_id && !$loginFailed ) {
                 // Success login
+                $userLoggingIn = true;
+
                 $_SESSION['itinerary-auth'] = $user_id;
                 $userLoggedIn = true;
                 // Get any stored sessions
@@ -223,13 +231,7 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio
             } else {
                 $loginFailed = true;
             }
-            global $wp;
             $tripPlannerPage = get_permalink( $this->config['settings']['itinerary_page'] );
-            // Redirect to trip planner page
-            // if ( $tripPlannerPage ) {
-            //     wp_redirect( $tripPlannerPage );
-            //     exit;
-            // }
             // $view = 'login.html';
             break;
         case 'forgot':
@@ -385,6 +387,7 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio
             'token'             => $token,
             'helpUrl'           => GLM_MEMBERS_ITINERARY_PLUGIN_URL . 'templates/helpme.html',
             'sendFormSubmit'    => $sendFormSubmit,
+            'userLoggingIn'     => $userLoggingIn,
         );
 
         error_reporting(E_ALL ^ E_NOTICE);
diff --git a/views/front/itinerary/list.html b/views/front/itinerary/list.html
index 16ab390..b743ef3 100644
--- a/views/front/itinerary/list.html
+++ b/views/front/itinerary/list.html
@@ -138,6 +138,10 @@
     jQuery(document).ready(function($){
         var glm_itinerary_page_url = '{$thisUrl}';
 
+        {if $userLoggingIn}
+            window.location.href = '{$thisUrl}';
+        {/if}
+
         $('.glm-itinerary-delete').on('click', function(e){
             e.preventDefault();
             var member_id = $(this).data('id');
@@ -282,4 +286,13 @@
 
     });
 </script>
+{else}
+<script>
+    jQuery(document).ready(function($){
+        {if $userLoggingIn}
+            window.location.href = '{$thisUrl}';
+        {/if}
+
+    });
+</script>
 {/if}
-- 
2.17.1