From 3b58da860fd9addec8656fe90cfdb5a755d6407e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 19 Aug 2019 12:08:41 -0400 Subject: [PATCH] fix --- web/includes/auth.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/includes/auth.php b/web/includes/auth.php index c4c58d29e..4ada2afa2 100644 --- a/web/includes/auth.php +++ b/web/includes/auth.php @@ -271,10 +271,12 @@ if ( ZM_OPT_USE_AUTH ) { if ( ZM_AUTH_HASH_LOGINS && empty($user) && !empty($_REQUEST['auth']) ) { $user = getAuthUser($_REQUEST['auth']); } else if ( - ! ( empty($_REQUEST['username']) or empty($_REQUEST['password']) or - (defined('ZM_OPT_USE_GOOG_RECAPTCHA') && ZM_OPT_USE_GOOG_RECAPTCHA ) + ! ( + empty($_REQUEST['username']) or + empty($_REQUEST['password']) or + (defined('ZM_OPT_USE_GOOG_RECAPTCHA') && ZM_OPT_USE_GOOG_RECAPTCHA) ) ) { - $ret = validateUser($_REQUEST['username'], $_REQUEST['password'); + $ret = validateUser($_REQUEST['username'], $_REQUEST['password']); if ( !$ret[0] ) { ZM\Error($ret[1]); unset($user); // unset should be ok here because we aren't in a function