From 85bde6565c86331de80a42d9a1665c0f9ae9ef70 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 24 Oct 2024 19:36:21 +0200
Subject: [PATCH] System: Access: Users - change isset() to !empty() for
 disabled status in preperation for
 https://github.com/opnsense/core/issues/7904

---
 src/etc/inc/auth.inc                                 | 2 +-
 src/opnsense/mvc/app/library/OPNsense/Auth/API.php   | 2 +-
 src/opnsense/mvc/app/library/OPNsense/Auth/Local.php | 2 +-
 src/www/system_usermanager.php                       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc
index 84504ef04..d53206baa 100644
--- a/src/etc/inc/auth.inc
+++ b/src/etc/inc/auth.inc
@@ -328,7 +328,7 @@ function local_user_set(&$user, $force_password = false, $userattrs = null)
     $is_expired = !empty($user['expires']) &&
         strtotime('-1 day') > strtotime(date('m/d/Y', strtotime($user['expires'])));
 
-    $is_disabled = isset($user['disabled']);
+    $is_disabled = !empty($user['disabled']);
 
     $is_unlocked = !$is_disabled && !$is_expired;
 
diff --git a/src/opnsense/mvc/app/library/OPNsense/Auth/API.php b/src/opnsense/mvc/app/library/OPNsense/Auth/API.php
index 196220bb7..a1e3b73af 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Auth/API.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Auth/API.php
@@ -160,7 +160,7 @@ class API extends Base implements IAuthConnector
         }
 
         if ($userObject != null) {
-            if (isset($userObject->disabled)) {
+            if (!empty((string)$userObject->disabled)) {
                 // disabled user
                 return false;
             }
diff --git a/src/opnsense/mvc/app/library/OPNsense/Auth/Local.php b/src/opnsense/mvc/app/library/OPNsense/Auth/Local.php
index f95cde714..e0cef7e78 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Auth/Local.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Auth/Local.php
@@ -153,7 +153,7 @@ class Local extends Base implements IAuthConnector
     {
         $userObject = $this->getUser($username);
         if ($userObject != null) {
-            if (isset($userObject->disabled)) {
+            if (!empty((string)$userObject->disabled)) {
                 // disabled user
                 return false;
             }
diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php
index 2ebd89216..5ecab7b4a 100644
--- a/src/www/system_usermanager.php
+++ b/src/www/system_usermanager.php
@@ -149,7 +149,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                 $pconfig['usernamefld'] = $a_user[$id]['name'];
             }
             $pconfig['groups'] = local_user_get_groups($a_user[$id]);
-            $pconfig['disabled'] = isset($a_user[$id]['disabled']);
+            $pconfig['disabled'] = !empty($a_user[$id]['disabled']);
             foreach ($fieldnames as $fieldname) {
                 if (isset($a_user[$id][$fieldname])) {
                     $pconfig[$fieldname] = $a_user[$id][$fieldname];
@@ -1017,7 +1017,7 @@ $( document ).ready(function() {
                     <tr>
                       <td>
 <?php
-                        if (isset($userent['disabled'])) {
+                        if (!empty($userent['disabled'])) {
                             $usrimg = 'text-muted';
                         } elseif (userIsAdmin($userent['name'])) {
                             $usrimg = 'text-danger';