From 85faa7321cfc8bf5ea8fbb1c5a361a85c05dec98 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 17 Oct 2016 13:12:13 -0400
Subject: [PATCH] reorder if logic to handle first page load before AuthHash
 has ever been set.

---
 web/includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 3b6f2b542..509f97b7c 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -143,7 +143,7 @@ function getAuthUser( $auth ) {
 function generateAuthHash( $useRemoteAddr ) {
   if ( ZM_OPT_USE_AUTH and ZM_AUTH_RELAY == 'hashed' and $_SESSION['username'] and $_SESSION['passwordHash'] ) {
     # regenerate a hash at half the liftetime of a hash, an hour is 3600 so half is 1800
-    if ( ( $_SESSION['AuthHashGeneratedAt'] < time() - ( ZM_AUTH_HASH_TTL * 1800 ) ) or ! isset($_SESSION['AuthHash']) ) {
+    if ( ( ! isset($_SESSION['AuthHash']) ) or ( $_SESSION['AuthHashGeneratedAt'] < time() - ( ZM_AUTH_HASH_TTL * 1800 ) ) ) {
       # Don't both regenerating Auth Hash if an hour hasn't gone by yet
       $time = localtime();
       $authKey = '';