From 823acb13e20402a3a761016d0f08bf139b819dc8 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 16 Aug 2021 15:45:59 +0800 Subject: [PATCH] Fix #6800 - Login Dialog Remember Username / 2FA + other fixes --- Pman.php | 3 ++- Pman/Login.php | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Pman.php b/Pman.php index 9f9c783..b048ef5 100644 --- a/Pman.php +++ b/Pman.php @@ -560,7 +560,8 @@ class Pman extends HTML_FlexyFramework_Page echo $this->jsencode(array( 'success'=> false, - 'data'=> array(), + 'data'=> array(), + 'code' => $type, 'errorMsg' => $str, 'message' => $str, // compate with exeption / loadexception. 'errors' => $errors ? $errors : true, // used by forms to flag errors. diff --git a/Pman/Login.php b/Pman/Login.php index df0aafd..6a20063 100644 --- a/Pman/Login.php +++ b/Pman/Login.php @@ -340,7 +340,7 @@ class Pman_Login extends Pman } if(!empty($u->oath_key) && empty($_REQUEST['oath_password'])){ - $this->jerror('LOGIN-BAD','Your account requires Two-Factor Authentication'); + $this->jerror('LOGIN-2FA','Your account requires Two-Factor Authentication'); } // check if config allows non-owner passwords. @@ -584,22 +584,22 @@ class Pman_Login extends Pman $core_ip_access->sendXMPP(); - $this->jerr('NEW-IP-ADDRESS', array('ip' => $ip)); + $this->jerror('NEW-IP-ADDRESS', "New IP Address = needs approving", array('ip' => $ip)); return; } if(empty($core_ip_access->status)){ - $this->jerr('PENDING-IP-ADDRESS', array('ip' => $ip)); + $this->jerror('PENDING-IP-ADDRESS', "IP is still pending approval", array('ip' => $ip)); } if($core_ip_access->status == -1){ - $this->jerr('BLOCKED-IP-ADDRESS', array('ip' => $ip)); + $this->jerror('BLOCKED-IP-ADDRESS', "Your IP is blocked", array('ip' => $ip)); return; } if($core_ip_access->status == -2 && strtotime($core_ip_access->expire_dt) < strtotime('NOW')){ - $this->jerr('BLOCKED-IP-ADDRESS', array('ip' => $ip)); + $this->jerrpr('BLOCKED-IP-ADDRESS', "Your IP is blocked", array('ip' => $ip)); return; } -- 2.39.2