From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 27 Nov 2018 21:45:57 +0000 (-0500)
Subject: Logging out on front end is now effective and changes login form.
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=1a09881995a5ce5e4baaafcd8d5c23342744ae34;p=WP-Plugins%2Fglm-member-db-itinerary.git

Logging out on front end is now effective and changes login form.
---

diff --git a/css/front.css b/css/front.css
index 382ea6f..5f61ae1 100644
--- a/css/front.css
+++ b/css/front.css
@@ -10,6 +10,20 @@
     border-radius: 8px;
     padding: 10px 20px;
 }
+#glm-itinerary-account-container .glm-itinerary-sign-in {
+    font-size: 18px;
+}
+#glm-itinerary-account-container .glm-itinerary-forgot-password {
+    clear: both;
+    display: block;
+}
+#glm-itinerary-account-container .glm-itinerary-no-account {
+    font-size: 18px;
+}
+#glm-itinerary-login .glm-error {
+    color: red;
+    font-weight: bold;
+}
 #glm-itinerary-logged-in-as {
     display: block;
     position: relative;
diff --git a/models/front/itinerary/list.php b/models/front/itinerary/list.php
index 77d9c3c..d947c16 100755
--- a/models/front/itinerary/list.php
+++ b/models/front/itinerary/list.php
@@ -70,6 +70,7 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio
         $option            = 'list';
         $formContents      = '';
         $userLoggedIn      = false;
+        $loginFailed       = false;
         $createSuccess     = false;
         $members           = array();
         $membersWithEmails = array();
@@ -97,15 +98,10 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio
         if ( isset( $_REQUEST['option'] ) ) {
             $option = filter_var( $_REQUEST['option'], FILTER_SANITIZE_STRING );
         }
-
+        
         if ( isset( $_SESSION['itinerary-auth'] ) && filter_var( $_SESSION['itinerary-auth'], FILTER_VALIDATE_INT ) ) {
             $userLoggedIn = true;
         }
-        
-        if ( isset( $_SESSION['username'])) {
-            
-
-        }
 
         switch ( $option ) {
         case 'addAccount':
@@ -221,7 +217,9 @@ 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
@@ -282,7 +280,17 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio
                 $formContents = '';
             }
             break;
+        case 'logout':
+            $userLoggedIn = false;
+            $_SESSION['itinerary-auth'] = false;
+            break;
         case 'list':
+            $view = 'list.html';
+        default:
+            break;
+        }
+
+        if ( $userLoggedIn ) {
             $userInfo['email'] = $this->wpdb->get_var(
                 $this->wpdb->prepare(
                     "SELECT email
@@ -291,9 +299,6 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio
                     filter_var( $_SESSION['itinerary-auth'], FILTER_VALIDATE_INT )
                 )
             );
-            $view = 'list.html';
-        default:
-            break;
         }
 
         $templateData = array(
@@ -304,6 +309,7 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio
             'formContents'      => $formContents,
             'states'            => $states,
             'userLoggedIn'      => $userLoggedIn,
+            'loginFailed'       => $loginFailed,
             'formErrors'        => $formErrors,
             'createSuccess'     => $createSuccess,
             'userInfo'          => $userInfo,
diff --git a/views/front/itinerary/list.html b/views/front/itinerary/list.html
index d241148..e00fde3 100644
--- a/views/front/itinerary/list.html
+++ b/views/front/itinerary/list.html
@@ -15,30 +15,33 @@
 
     {if !$userLoggedIn}
     <div id="glm-itinerary-login" class="glma-columns glma-small-12 glma-medium-4">
-        <form action="{$thisUrl}" method="post">
+        <form action="{$thisUrl}#glm-itinerary-account-container" method="post">
             <input type="hidden" name="option" value="login" />
             <div>
-                <h2>Sign In:</h2>
+                <h2 class="glm-itinerary-sign-in">Sign In:</h2>
+                {if $loginFailed}
+                    <span class="glm-error">Invalid email or password</span>
+                {/if}
                 <label for="username" class="glm-required"> Email </label>
                 <input type="text" id="username" name="username" />
                 <label for="password" class="glm-required"> Password </label>
                 <input type="password" id="password" name="password"  />
                 <input type="submit" value="Log in" class="button" />
-                <a href="{$thisUrl}?option=forgot">Forgot your Password?</a>
+                <a class="glm-itinerary-forgot-password" href="{$thisUrl}?option=forgot">Forgot your Password?</a>
             </div>
         </form>
     </div>
 
     <div id="glm-itinerary-account" class="glma-columns glma-small-12 glma-medium-4">
-        <h2>If you do not have an account</h2>
-        <a href="{$thisUrl}?option=create"> Create Account </a><br>
+        <h2 class="glm-itinerary-no-account">If you do not have an account</h2>
+        <a class="glm-itinerary-create-account" href="{$thisUrl}?option=create"> Create Account </a><br>
         By creating an account, you'll be able to save your list for later.
     </div>
     {else}
     <div id="glm-itinerary-logged-in-as" class="glma-columns glma-small-12 glma-medium-8">
         <span class="glm-itinerary-label">Logged in as </span>
         <span class="glm-itinerary-email">{$userInfo.email}</span>
-        <a class="glm-itinerary-logout-link" href="https://www.uptravel.com/Toolkit/Members/TripPlanner/login.php?logout=1" style="display: block; margin-top: 6px;">Log Out</a>
+        <a class="glm-itinerary-logout-link" href="{$thisUrl}?option=logout#glm-itinerary-account-container" style="display: block; margin-top: 6px;">Log Out</a>
     </div>
     {/if}